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

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[6756] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2012-08-15 11:58:51
Message-ID: E1T1cFP-0000Ik-FW () sfp-svn-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 6756
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6756&view=rev
Author:   gespinasse
Date:     2012-08-15 11:58:51 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Upgrade pkgconfig to 0.27
This match what LFS do and solve a configure warning in udev,rsyslog
configure: line xxx: --variable=systemdsystemunitdir: command not found
another configure warning in ncurses-5.9
configure: WARNING: did not find library none/lib/pkgconfig
but add some compilation warnings (probably in the now include glib part)
and this configure warning that should not hurt
./configure: line 8473: ./po/POTFILES.in: No such file or directory

Modified Paths:
--------------
    ipcop/trunk/lfs/e2fsprogs
    ipcop/trunk/lfs/glib
    ipcop/trunk/lfs/pkg-config
    ipcop/trunk/make.sh

Modified: ipcop/trunk/lfs/e2fsprogs
===================================================================
--- ipcop/trunk/lfs/e2fsprogs	2012-08-14 18:24:41 UTC (rev 6755)
+++ ipcop/trunk/lfs/e2fsprogs	2012-08-15 11:58:51 UTC (rev 6756)
@@ -89,8 +89,6 @@
 	# Do we need swapfs (on ppc?). In doubt, I let it
 	# --disable-debugfs cause the tests to fail
 	cd $(DIR_APP)/build &&				\
-		PKG_CONFIG=true				\
-		LDFLAGS="$(LDFLAGS) -lblkid -luuid"	\
 		../configure				\
 			--prefix=/usr			\
 			--disable-nls			\

Modified: ipcop/trunk/lfs/glib
===================================================================
--- ipcop/trunk/lfs/glib	2012-08-14 18:24:41 UTC (rev 6755)
+++ ipcop/trunk/lfs/glib	2012-08-15 11:58:51 UTC (rev 6756)
@@ -92,10 +92,6 @@
 	# Don't care about zlib flags. zlib matter on gio lib only that is not include in \
iso.  # --with-threads=none break pango-1.28.4
 	cd $(DIR_APP) &&		\
-		PCRE_LIBS=-lpcre	\
-		PCRE_CFLAGS=" "		\
-		LIBFFI_LIBS=-lffi	\
-		LIBFFI_CFLAGS=-I/usr/lib/$(LIBFFIVERSION)/include \
 		./configure		\
 			--prefix=/usr	\
 			--disable-static \
@@ -115,8 +111,6 @@
 	# Continue testing on error with -k
 	-cd $(DIR_APP); make -j 1 -k check TZDIR=/usr/share/zoneinfo/posix &> \
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log  endif
-	# The way pkgconfig is configured, this link is required
-	ln -sf ../../lib/glib-2.0/include/glibconfig.h /usr/include/glib-2.0/glibconfig.h
 
 	rm -f /usr/lib/lib{gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0}.la
 	# To see only installed file that we care, the easiest is to remove the others \
after install

Modified: ipcop/trunk/lfs/pkg-config
===================================================================
--- ipcop/trunk/lfs/pkg-config	2012-08-14 18:24:41 UTC (rev 6755)
+++ ipcop/trunk/lfs/pkg-config	2012-08-15 11:58:51 UTC (rev 6756)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = pkg-config
-VER        = 0.26
+VER        = 0.27
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 47525c26a9ba7ba14bf85e01509a7234
+$(DL_FILE)_MD5 = 3a4c9feab14b6719afd8904945d9b4e4
 
 install : $(TARGET)
 
@@ -81,15 +81,15 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	# Fix a test issue
-	cd $(DIR_APP) && sed -i -e '21s/EXPECT_RETURN=1/EXPECT_RETURN=0/' \
check/check-cmd-options  
-	cd $(DIR_APP) && GLIB_LIBS=-lglib-2.0 GLIB_CFLAGS=-I/usr/include/glib-2.0 \
./configure --prefix=/usr +	cd $(DIR_APP) && ./configure --prefix=/usr \
--with-internal-glib  cd $(DIR_APP) && make -j $(PARALLELISM)
+
 ifeq "$(RUNNING_TEST)" "yes"
 	cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
-	# 6 tests and 11 glib tests should pass
+	# 12 tests should pass
 endif
+
 	cd $(DIR_APP) && make install
 
 	@rm -rf $(DIR_APP)

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2012-08-14 18:24:41 UTC (rev 6755)
+++ ipcop/trunk/make.sh	2012-08-15 11:58:51 UTC (rev 6756)
@@ -1688,6 +1688,7 @@
 	chroot_make gcc
 	update-gcc-hash "${BASEDIR}/build_${MACHINE}/ipcop/usr/bin/gcc"
 	chroot_make sed
+	chroot_make pkg-config
 	chroot_make ncurses
 	chroot_make util-linux
 	chroot_make psmisc
@@ -1753,8 +1754,7 @@
 	# these for some of their client program functionality
 	chroot_make Python		# glib require Python
 	chroot_make libffi		# for glib
-	chroot_make glib		# for pkgconfig, cairo
-	chroot_make pkg-config
+	chroot_make glib		# for cairo
 	chroot_make ipcop
 	chroot_make which
 	chroot_make net-tools

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


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
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]