[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[5856] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2011-09-17 8:02:34
Message-ID: E1R4pr8-0002kD-5Y () sfp-svn-4 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 5856
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5856&view=rev
Author:   gespinasse
Date:     2011-09-17 08:02:33 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Use our compilation timestamp hack for rrdtool
Simplify rd_cv_ms_async=ok using that instruction on configure directly

Remove deprecated options fixing this warning
configure: WARNING: unrecognized options: --disable-libintl, --enable-local-libpng, \
--enable-local-zlib, --enable-latin2

We don't need to disable language we haven't build like lua and ruby, only disabling \
tcl and python is enought

I tested a Fedora hack that remove rpath from RRDs.so.
That work but I am unsure this is really needed, so that part stay commented.

rrtool is only include in update, so everyone will have the same file with same \
timestamp

Modified Paths:
--------------
    ipcop/trunk/lfs/rrdtool
    ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21
    ipcop/trunk/updates/1.9.21/information.xml

Modified: ipcop/trunk/lfs/rrdtool
===================================================================
--- ipcop/trunk/lfs/rrdtool	2011-09-16 15:46:33 UTC (rev 5855)
+++ ipcop/trunk/lfs/rrdtool	2011-09-17 08:02:33 UTC (rev 5856)
@@ -43,6 +43,11 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+# Used to include same timestamp for all
+# This is the release date
+DATESTAMP = "Dec 26 2010"
+TIMESTAMP = "23:18:00"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -81,25 +86,24 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -i -e 's|__DATE__|$(DATESTAMP)|' -e 's|__TIME__|$(TIMESTAMP)|' \
src/rrd_tool.c  
-	# This test depend on running kernel and work for our >=2.6.27 target
-	# Preset result to ok and use the cache file
-	# so even a running <2.6.27 kernel produce same files
-	cd $(DIR_APP) && echo "rd_cv_ms_async=ok" > config.cache
-	cd $(DIR_APP) && ./configure	--prefix=/usr/share/$(PKG_NAME) \
+	# we may really remove rpath from RRDs.so using this borrowed from Fedora, but is \
it really better +	# cd $(DIR_APP) && sed -i -e 's|-Wl,--rpath -Wl,\$$rp||g' \
bindings/perl-shared/Makefile.PL +
+	# rd_cv_ms_async test depend on host running kernel and work for our >=2.6.27 \
target +	# Preset result to ok, so even a running <2.6.27 kernel produce same files
+	cd $(DIR_APP) && \
+		rd_cv_ms_async=ok \
+		./configure	--prefix=/usr/share/$(PKG_NAME) \
 					--exec-prefix=/usr \
 					--mandir=/usr/share/man \
 					--disable-static \
 					--disable-python \
-					--disable-ruby \
+					--disable-rpath \
 					--disable-tcl \
-					--disable-libintl \
 					--enable-perl-site-install \
-					--enable-local-libpng \
-					--enable-local-zlib \
-					--with-pic \
-					--enable-latin2 \
-					--cache-file=config.cache
+					--with-pic
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install-exec
 	cd $(DIR_APP) && make site-perl-install

Modified: ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21
===================================================================
--- ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21	2011-09-16 15:46:33 UTC (rev \
                5855)
+++ ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21	2011-09-17 08:02:33 UTC (rev \
5856) @@ -79,6 +79,9 @@
 /usr/bin/yes
 /usr/sbin/chroot
 ##
+## rrdtools-1.4.5 fixed compilation timestamp
+/usr/bin/rrdtool
+##
 ## squid-3.1.15
 /usr/lib/squid/msnt_auth
 /usr/lib/squid/ncsa_auth

Modified: ipcop/trunk/updates/1.9.21/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.21/information.xml	2011-09-16 15:46:33 UTC (rev 5855)
+++ ipcop/trunk/updates/1.9.21/information.xml	2011-09-17 08:02:33 UTC (rev 5856)
@@ -6,6 +6,7 @@
         <description>Language updates.&lt;br /&gt;
         Use utf-8 when sending system email (traffic warning etc.).&lt;br /&gt;
         Fix SF bug #3403666, firewall timeframe rules.&lt;br /&gt;
+        Fix timestamp on rrdtool.&lt;br /&gt;
         Upgrade apache httpd to 2.2.21, coreutils to 8.13, squid to 3.1.15, \
                tzadata-2011j, usb-modeswitch-data to 20110805&lt;br /&gt;
         Upgrade usb-modeswitch to 1.1.9 and add jimsh mini-tcl</description>
         <previousversion>1.9.20</previousversion>

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]