Menu
▾
▴
[Ipcop-svn] SF.net SVN: ipcop:[6291] ipcop/trunk
|
From: <ges...@us...> - 2012-01-29 17:50:51
|
Revision: 6291
http://ipcop.svn.sourceforge.net/ipcop/?rev=6291&view=rev
Author: gespinasse
Date: 2012-01-29 17:50:45 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Upgrade lzo to 2.06, should be faster
Fix a few issues in configure (already present in 2.04)
- one host / target mismatch borrowed to Fedora
- alloca test id broken, force by using ac_cv_func_alloca=yes
- clock_getcpuclockid clock_getres clock_gettime tests are broken, and not used or if (0), remove them as that's easy
Add -Wall to CFLAGS to see potential warnings, none are found, that's fine.
Remove the .la file as Debian and Fedora do that.
Do not include the .so symlink in iso
Add the test suite
Test log is verbose (2MB) but I find nothing to make it smaller, except running less tests
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/lzo
ipcop/trunk/lfs/lzo
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/config/rootfiles/common/lzo
===================================================================
--- ipcop/trunk/config/rootfiles/common/lzo 2012-01-29 16:40:40 UTC (rev 6290)
+++ ipcop/trunk/config/rootfiles/common/lzo 2012-01-29 17:50:45 UTC (rev 6291)
@@ -1,5 +1,3 @@
-## lzo-2.02
-##
#usr/include/lzo
#usr/include/lzo/lzo1.h
#usr/include/lzo/lzo1a.h
@@ -14,7 +12,14 @@
#usr/include/lzo/lzoconf.h
#usr/include/lzo/lzodefs.h
#usr/include/lzo/lzoutil.h
-#usr/lib/liblzo2.la
-usr/lib/liblzo2.so
+#usr/lib/liblzo2.so
usr/lib/liblzo2.so.2
usr/lib/liblzo2.so.2.0.0
+#usr/share/doc/lzo
+#usr/share/doc/lzo/AUTHORS
+#usr/share/doc/lzo/COPYING
+#usr/share/doc/lzo/LZO.FAQ
+#usr/share/doc/lzo/LZO.TXT
+#usr/share/doc/lzo/LZOAPI.TXT
+#usr/share/doc/lzo/NEWS
+#usr/share/doc/lzo/THANKS
Modified: ipcop/trunk/lfs/lzo
===================================================================
--- ipcop/trunk/lfs/lzo 2012-01-29 16:40:40 UTC (rev 6290)
+++ ipcop/trunk/lfs/lzo 2012-01-29 17:50:45 UTC (rev 6291)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = lzo
-VER = 2.04
+VER = 2.06
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,6 +43,8 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+CFLAGS += -Wall
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -51,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a383c7055a310e2a71b9ecd19cfea238
+$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8
install : $(TARGET)
@@ -81,14 +83,27 @@
$(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) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_configure.patch
- cd $(DIR_APP) && ./configure --enable-shared \
+ # clock_getcpuclockid clock_getres clock_gettime tests are broken, and not used or if (0)
+ cd $(DIR_APP) && sed -i 's/clock_getcpuclockid clock_getres clock_gettime//' configure
+ # alloca detection is broken, workaround that
+ cd $(DIR_APP) && ac_cv_func_alloca=yes \
+ ./configure \
+ --enable-shared \
--disable-static \
--prefix=/usr \
--target=$(MACHINE)
cd $(DIR_APP) && make -j $(PARALLELISM)
+
+ifeq "$(RUNNING_TEST)" "yes"
+ # Do not to stop on error in tests, run both check and test targets
+ -cd $(DIR_APP); make -j 1 check test &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
+
cd $(DIR_APP) && make install
+ rm /usr/lib/liblzo*.la
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
-
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-01-29 16:40:40 UTC (rev 6290)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-01-29 17:50:45 UTC (rev 6291)
@@ -239,6 +239,10 @@
/lib/modules/2.6.32-6/extra/solos-pci.ko.gz
/lib/modules/2.6.32-6/kernel
##
+## lzo-2.0.6
+/usr/lib/liblzo2.so.2
+/usr/lib/liblzo2.so.2.0.0
+##
## ntp-4.2.6p5
/usr/bin/ntpd
/usr/bin/ntpdate
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2012-01-29 16:40:40 UTC (rev 6290)
+++ ipcop/trunk/updates/2.0.3/information.xml 2012-01-29 17:50:45 UTC (rev 6291)
@@ -11,8 +11,9 @@
Upgrade acpid to 2.0.14, bash to 4.2.20, coreutils to 8.15,
conntrack-tools to 1.0.1, DBD-SQLite to 1.35, diffutils to 3.2,
freetype to 2.4.8, gmp to 5.0.3, grep to 2.10, iproute2 to 3.2.0, iptables to 1.4.12.2, iw to 3.3,
- kbd to 1.15.3, kernel to 2.6.32.55, libnetfilter_conntrack to 1.0.0, libnl to 3.2.7, libpcap to 1.2.1, ntp to 4.2.6p5,
- openldap to 2.4.28, openssl to 1.0.0g, openvpn to 2.2.2, pciutils to 3.1.9, rrdtool to 1.4.7, smartmontools to 5.42, Solos PCI to 1.03,
+ kbd to 1.15.3, kernel to 2.6.32.55, libnetfilter_conntrack to 1.0.0, libnl to 3.2.7,
+ libpcap to 1.2.1, lzo to 2.0.6, ntp to 4.2.6p5,
+ openldap to 2.4.28, openssl to 1.0.0g, openvpn to 2.2.2, rrdtool to 1.4.7, smartmontools to 5.42, Solos PCI to 1.03,
sqlite to 3.7.10, squid to 3.1.18, tcpdump to 4.2.1, usbutils to 004, usb-modeswitch to 1.2.3, usb-modeswitch-data to 20120120.
<br />
<b>Mandatory reboot after upgrade.</b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|