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

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7026] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2013-05-08 10:04:39
Message-ID: E1Ua1El-0008UO-5b () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7026
          http://ipcop.svn.sourceforge.net/ipcop/?rev=7026&view=rev
Author:   gespinasse
Date:     2013-05-08 10:04:38 +0000 (Wed, 08 May 2013)
Log Message:
-----------
Compile tcl against the finale glibc is the proper fix for krb5  warnings no previous \
prototype for 'ptsname_r' Workaround the krb5 new unknow pragma GCC diagnostic caused \
by -Wmaybe-uninitialized

Modified Paths:
--------------
    ipcop/trunk/lfs/krb5
    ipcop/trunk/lfs/tcl
    ipcop/trunk/make.sh

Modified: ipcop/trunk/lfs/krb5
===================================================================
--- ipcop/trunk/lfs/krb5	2013-05-08 09:52:50 UTC (rev 7025)
+++ ipcop/trunk/lfs/krb5	2013-05-08 10:04:38 UTC (rev 7026)
@@ -96,11 +96,12 @@
 	# gcc-4.4 don't know about #pragma GCC diagnostic push/pop and warn during \
compilation.  # gcc-4.6 is required for that push/pop feature.
 	# That mean gcc-4.4 can't pop diagnostic ignored "-Wuninitialized" and not ignore \
                that warning
-	# Replace pop with diagnostic error
+	# Remove push and replace pop with diagnostic error
+	# Remove -Wmaybe-uninitialized line as no understood by gcc-4.4
 	cd  $(DIR_APP) && sed -i -e 's/^#pragma GCC diagnostic push$$//g' \
-				-e 's/^#pragma GCC diagnostic pop/#pragma GCC diagnostic error \
"-Wuninitialized"/g' lib/krb5/krb/{x-deltat.y,deltat.c} +				-e 's/^#pragma GCC \
diagnostic pop/#pragma GCC diagnostic error "-Wuninitialized"/g' \ +				-e \
'/Wmaybe-uninitialized/d' lib/krb5/krb/{x-deltat.y,deltat.c}  
-	# -no-fatal-warnings is at least for the various warning: no previous prototype for \
and mktemp is dangerous  # Do not detect python on rebuild with ac_cv_prog_PYTHON=
 	# Don't care that much about libverto that may be used too on a more recent glib.
 	# libverto linked code (krb5kdc kadmind) is not include.
@@ -111,7 +112,6 @@
 			--prefix=/usr					\
 			--localstatedir=/var/lib			\
 			--with-crypto-impl=openssl			\
-			--with-tcl=/$(TOOLS_DIR)			\
 			--with-system-et				\
 			--with-system-ss
 

Modified: ipcop/trunk/lfs/tcl
===================================================================
--- ipcop/trunk/lfs/tcl	2013-05-08 09:52:50 UTC (rev 7025)
+++ ipcop/trunk/lfs/tcl	2013-05-08 10:04:38 UTC (rev 7026)
@@ -85,7 +85,6 @@
 ifeq "$(STAGE)" "toolchain"
 	cd $(DIR_APP)/unix && ./configure --prefix=/$(TOOLS_DIR)
 	cd $(DIR_APP)/unix && make -j $(PARALLELISM)
-
 ifeq "$(RUNNING_TEST)" "yes"
 	# If you have error on those tests http.test httpold.test socket.test
 	# check host machine with uname -n, hostname -f, hostname -i
@@ -101,5 +100,18 @@
 	ln -sf tclsh8.5 /$(TOOLS_DIR)/bin/tclsh
 endif
 
+ifeq "$(STAGE)" "ipcop"
+	cd $(DIR_APP)/unix && ./configure --prefix=/usr
+	cd $(DIR_APP)/unix && make -j $(PARALLELISM)
+ifeq "$(RUNNING_TEST)" "yes"
+	-cd $(DIR_APP)/unix && TZ=UTC make test &> \
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log +endif
+
+	cd $(DIR_APP)/unix && make install
+	chmod u+w /usr/lib/libtcl8.5.so
+	cd $(DIR_APP)/unix && make install-private-headers
+	ln -sf tclsh8.5 /usr/bin/tclsh
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2013-05-08 09:52:50 UTC (rev 7025)
+++ ipcop/trunk/make.sh	2013-05-08 10:04:38 UTC (rev 7026)
@@ -1812,6 +1812,7 @@
 	chroot_make libffi		# for Python, glib
 	chroot_make Python		# glib require Python
 	chroot_make glib		# for cairo
+	chroot_make tcl			# for krb5 and db tests
 	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.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
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]