r1585 - in trunk: . audiofile curl espgs libol libpng libxml2 libxslt neon pcre

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jul 4 13:25:32 PDT 2006


Author: jim
Date: 2006-07-04 14:25:23 -0600 (Tue, 04 Jul 2006)
New Revision: 1585

Added:
   trunk/audiofile/audiofile-0.2.6-multilib-1.patch
   trunk/curl/curl-7.15.4-multilib-1.patch
   trunk/espgs/espgs-8.15.2-multilib-1.patch
   trunk/libol/
   trunk/libol/libol-0.3.18-multilib-1.patch
   trunk/libpng/libpng-1.2.10-multilib-1.patch
   trunk/libpng/libpng-1.2.12-multilib-1.patch
   trunk/libxml2/
   trunk/libxml2/libxml2-2.6.26-multilib-1.patch
   trunk/libxslt/
   trunk/libxslt/libxslt-1.1.17-multilib-1.patch
   trunk/neon/
   trunk/neon/neon-0.26.1-multilib-1.patch
   trunk/pcre/
   trunk/pcre/pcre-6.6-multilib-1.patch
Modified:
   trunk/
Log:
 r1790 at server:  jim | 2006-07-04 13:24:32 -0700
 Added various multilib patches



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1781
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1790

Added: trunk/audiofile/audiofile-0.2.6-multilib-1.patch
===================================================================
--- trunk/audiofile/audiofile-0.2.6-multilib-1.patch	                        (rev 0)
+++ trunk/audiofile/audiofile-0.2.6-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,19 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 0.2.6
+Origin: Various
+Description: Make audiofile-config Multilib Friendly
+
+diff -Naur audiofile-0.2.6.orig/audiofile-config.in audiofile-0.2.6/audiofile-config.in
+--- audiofile-0.2.6.orig/audiofile-config.in	2004-03-05 22:39:23.000000000 -0800
++++ audiofile-0.2.6/audiofile-config.in	2006-07-04 12:35:48.386966857 -0700
+@@ -45,8 +45,7 @@
+       echo $includes
+       ;;
+     --libs)
+-      libdirs=-L at libdir@
+-      echo $libdirs -laudiofile -lm
++      echo -laudiofile -lm
+       ;;
+     *)
+       echo "${usage}" 1>&2

Added: trunk/curl/curl-7.15.4-multilib-1.patch
===================================================================
--- trunk/curl/curl-7.15.4-multilib-1.patch	                        (rev 0)
+++ trunk/curl/curl-7.15.4-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,18 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 7.15.4
+Origin: Various
+Description: Make curl-onfig Multilib Friendly
+
+diff -Naur curl-7.15.4.orig/curl-config.in curl-7.15.4/curl-config.in
+--- curl-7.15.4.orig/curl-config.in	2006-05-02 15:48:22.000000000 -0700
++++ curl-7.15.4/curl-config.in	2006-07-04 12:42:51.425803497 -0700
+@@ -181,7 +181,7 @@
+        	;;
+ 
+     --libs)
+-       	echo -L at libdir@ -lcurl @LDFLAGS@ @LIBS@
++       	echo -lcurl @LDFLAGS@ @LIBS@
+        	;;
+ 
+     *)

Added: trunk/espgs/espgs-8.15.2-multilib-1.patch
===================================================================
--- trunk/espgs/espgs-8.15.2-multilib-1.patch	                        (rev 0)
+++ trunk/espgs/espgs-8.15.2-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,30 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 8.15.2
+Origin: Various
+Description: Make ijs-config Multilib Friendly
+
+diff -Naur espgs-8.15.2.orig/ijs/ijs-config.in espgs-8.15.2/ijs/ijs-config.in
+--- espgs-8.15.2.orig/ijs/ijs-config.in	2005-09-23 12:40:59.000000000 -0700
++++ espgs-8.15.2/ijs/ijs-config.in	2006-07-04 12:16:28.262157209 -0700
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+ 
+ prefix=@prefix@
+-libdir=@libdir@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ 
+@@ -44,11 +43,7 @@
+       echo $includes
+       ;;
+     --libs)
+-      case "x$libdir" in
+-        x/lib | x/lib64 | x/usr/lib | x/usr/lib64) ;;
+-        *) libdirs="-L$libdir" ;;
+-      esac
+-      echo $libdirs -lijs
++      echo -lijs
+       ;;
+     *)
+       echo "${usage}" 1>&2

Added: trunk/libol/libol-0.3.18-multilib-1.patch
===================================================================
--- trunk/libol/libol-0.3.18-multilib-1.patch	                        (rev 0)
+++ trunk/libol/libol-0.3.18-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,19 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 0.3.18
+Origin: Various
+Description: Make libol-config Multilib Friendly
+
+diff -Naur libol-0.3.18/libol-config.in libol-0.3.18.orig/libol-config.in
+--- libol-0.3.18/libol-config.in	2006-07-04 12:52:26.832221125 -0700
++++ libol-0.3.18.orig/libol-config.in	1999-07-10 06:23:07.000000000 -0700
+@@ -47,7 +47,8 @@
+       echo $includes
+       ;;
+     --libs)
+-      echo -lol @LIBS@
++      libdirs=-L at libdir@
++      echo $libdirs -lol @LIBS@
+       ;;
+     --static-libs)
+       echo @libdir@/libol.a @LIBS@

Added: trunk/libpng/libpng-1.2.10-multilib-1.patch
===================================================================
--- trunk/libpng/libpng-1.2.10-multilib-1.patch	                        (rev 0)
+++ trunk/libpng/libpng-1.2.10-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,26 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 1.2.10
+Origin: Various
+Description: Make libpng-config Multilib Friendly
+
+diff -Naur libpng-1.2.10.orig/scripts/libpng-config.in libpng-1.2.10/scripts/libpng-config.in
+--- libpng-1.2.10.orig/scripts/libpng-config.in	2006-03-02 18:48:03.000000000 -0800
++++ libpng-1.2.10/scripts/libpng-config.in	2006-07-04 12:57:46.031343325 -0700
+@@ -8,11 +8,11 @@
+ 
+ # Modeled after libxml-config.
+ 
+-version="@PNGLIB_VERSION@"
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
+-includedir="@includedir@/libpng at PNGLIB_MAJOR@"
++version=`pkg-config --modversion libpng`
++prefix=`pkg-config --variable prefix libpng`
++exec_prefix=`pkg-config --variable exec_prefix libpng`
++libdir=`pkg-config --variable libdir libpng`
++includedir=`pkg-config --variable includedir libpng`
+ libs="-lpng at PNGLIB_MAJOR@"
+ all_libs="-lpng at PNGLIB_MAJOR@ -lz -lm"
+ I_opts="-I${includedir}"

Added: trunk/libpng/libpng-1.2.12-multilib-1.patch
===================================================================
--- trunk/libpng/libpng-1.2.12-multilib-1.patch	                        (rev 0)
+++ trunk/libpng/libpng-1.2.12-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1 @@
+link libpng-1.2.10-multilib-1.patch
\ No newline at end of file

Added: trunk/libxml2/libxml2-2.6.26-multilib-1.patch
===================================================================
--- trunk/libxml2/libxml2-2.6.26-multilib-1.patch	                        (rev 0)
+++ trunk/libxml2/libxml2-2.6.26-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,42 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 2.6.16
+Origin: Various
+Description: Make xml2-config Multilib Friendly
+
+diff -Naur libxml2-2.6.26.orig/xml2-config.in libxml2-2.6.26/xml2-config.in
+--- libxml2-2.6.26.orig/xml2-config.in	2006-06-06 08:28:51.000000000 -0700
++++ libxml2-2.6.26/xml2-config.in	2006-07-04 13:07:16.153775484 -0700
+@@ -3,7 +3,17 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+-libdir=@libdir@
++if [ "`ldd /bin/sh | grep lib64`" = "" ]
++then
++	if [ "`ldd /bin/sh | grep lib32`" = "" ]
++	then
++	    libdir=${exec_prefix}/lib
++	else
++	libdir=${exec_prefix}/lib32
++	fi
++else
++    libdir=${exec_prefix}/lib64
++fi
+ 
+ usage()
+ {
+@@ -88,7 +98,12 @@
+ 	    then
+ 		echo @XML_LIBS@ 
+ 	    else
+-		echo @XML_LIBDIR@ @XML_LIBS@ 
++		    if [ "@XML_LIBDIR@" = "-L/usr/lib32" ]
++		    then
++			echo @XML_LIBS@ 
++		    else
++			echo @XML_LIBDIR@ @XML_LIBS@ 
++		    fi
+ 	    fi
+ 	else
+ 	    echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@

Added: trunk/libxslt/libxslt-1.1.17-multilib-1.patch
===================================================================
--- trunk/libxslt/libxslt-1.1.17-multilib-1.patch	                        (rev 0)
+++ trunk/libxslt/libxslt-1.1.17-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,28 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 1.1.17
+Origin: Various
+Description: Make xslt-config Multilib Friendly
+
+diff -Naur libxslt-1.1.17.orig/xslt-config.in libxslt-1.1.17/xslt-config.in
+--- libxslt-1.1.17.orig/xslt-config.in	2005-10-02 02:25:21.000000000 -0700
++++ libxslt-1.1.17/xslt-config.in	2006-07-04 13:11:48.853025559 -0700
+@@ -4,7 +4,17 @@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ includedir=@includedir@
+-libdir=@libdir@
++if [ "`ldd /bin/sh | grep lib64`" = "" ]
++then
++       if [ "`ldd /bin/sh | grep lib32`" = "" ]
++       then
++           libdir=${exec_prefix}/lib
++       else
++       libdir=${exec_prefix}/lib32
++       fi
++else
++    libdir=${exec_prefix}/lib64
++fi
+ 
+ usage()
+ {

Added: trunk/neon/neon-0.26.1-multilib-1.patch
===================================================================
--- trunk/neon/neon-0.26.1-multilib-1.patch	                        (rev 0)
+++ trunk/neon/neon-0.26.1-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,64 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 0.26.1
+Origin: Various
+Description: Make neon-config Multilib Friendly
+
+diff -Naur neon-0.26.1.orig/neon-config.in neon-0.26.1/neon-config.in
+--- neon-0.26.1.orig/neon-config.in	2006-02-26 12:55:43.000000000 -0800
++++ neon-0.26.1/neon-config.in	2006-07-04 13:19:15.091798399 -0700
+@@ -5,7 +5,11 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+-libdir=@libdir@
++
++libdir=`pkg-config --variable=libdir neon`
++CFLAGS=`pkg-config --cflags neon`
++LIBS=`pkg-config --libs neon`
++has_lfs=`pkg-config --variable=has_lfs neon`
+ 
+ usage()
+ {
+@@ -23,7 +27,7 @@
+   --support FEATURE     exit with success if feature is supported
+ 
+  Known features: 
+-    dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@],
++    dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@has_lfs@],
+     i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
+ 
+ EOF
+@@ -69,11 +73,10 @@
+ 	;;
+ 
+     --cflags)
+-       	echo -I${includedir}/neon @NEON_CFLAGS@
++       	echo ${CFLAGS}
+        	;;
+ 
+     --libs)
+-        LIBS="-lneon @NEON_LIBS@"
+ 	# Don't add standard library paths
+         if test "$prefix" != "/usr"; then
+            LIBS="-L${libdir} ${LIBS}"
+@@ -93,7 +96,7 @@
+ 	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
+ 	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
+ 	dav|DAV) support @NE_FLAG_DAV@ ;;
+-	lfs|LFS) support @NE_FLAG_LFS@ ;;
++	lfs|LFS) support @${has_lfs}@ ;;
+ 	i18n|I18N) support @NE_FLAG_I18N@ ;;
+ 	ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
+ 	*) support no ;;
+diff -Naur neon-0.26.1.orig/neon.pc.in neon-0.26.1/neon.pc.in
+--- neon-0.26.1.orig/neon.pc.in	2004-10-02 11:47:02.000000000 -0700
++++ neon-0.26.1/neon.pc.in	2006-07-04 13:17:36.872068504 -0700
+@@ -2,6 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++has_lfs=@NE_FLAG_LFS@
+ 
+ Name: neon
+ Description: HTTP/WebDAV client library

Added: trunk/pcre/pcre-6.6-multilib-1.patch
===================================================================
--- trunk/pcre/pcre-6.6-multilib-1.patch	                        (rev 0)
+++ trunk/pcre/pcre-6.6-multilib-1.patch	2006-07-04 20:25:23 UTC (rev 1585)
@@ -0,0 +1,36 @@
+Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
+Date: 2006-07-04
+Initial Package Version: 6.6
+Origin: Various
+Description: Make pcre-config Multilib Friendly
+
+diff -Naur pcre-6.6.orig/pcre-config.in pcre-6.6/pcre-config.in
+--- pcre-6.6.orig/pcre-config.in	2006-02-06 04:17:16.000000000 -0800
++++ pcre-6.6/pcre-config.in	2006-07-04 12:22:33.601152524 -0700
+@@ -12,13 +12,6 @@
+       exit 1
+ fi
+ 
+-libR=
+-case `uname -s` in
+-  *SunOS*)
+-  libR=" -R at libdir@"
+-  ;;
+-esac
+-
+ while test $# -gt 0; do
+   case "$1" in
+   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+@@ -52,10 +45,10 @@
+       echo $includes
+       ;;
+     --libs-posix)
+-      echo -L at libdir@$libR -lpcreposix -lpcre
++      echo -lpcreposix -lpcre
+       ;;
+     --libs)
+-      echo -L at libdir@$libR -lpcre
++      echo -lpcre
+       ;;
+     *)
+       echo "${usage}" 1>&2




More information about the patches mailing list