[patch] Patch that makes ppc-macos patches version-dependent.

portage-dev-libs-glib-ppc-macos.patch (text/plain), 3.29 KB, created by Jeroen Roovers (RETIRED) on 2005-10-16 07:15:09 UTC

diff -uNr glib/files/glib-2.4.8-macos.patch glib.new/files/glib-2.4.8-macos.patch
--- glib/files/glib-2.4.8-macos.patch	1970-01-01 01:00:00.000000000 +0100
+++ glib.new/files/glib-2.4.8-macos.patch	2005-02-12 22:26:51.000000000 +0100
@@ -0,0 +1,35 @@
+--- glib-2.4.8/configure.orig	Thu Dec  2 15:36:40 2004
++++ glib-2.4.8/configure	Sat Feb 12 14:28:37 2005
+@@ -31712,9 +31712,9 @@
+          # skip cygwin -pthread or -pthreads test
+          ;;
+       *)
+-        for flag in pthread pthreads; do
++        for flag in '-pthread' '-pthreads' ''; do
+           glib_save_CFLAGS="$CFLAGS"
+-          CFLAGS="$CFLAGS -$flag"
++          CFLAGS="$CFLAGS $flag"
+           if test "$cross_compiling" = yes; then
+   cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -31803,8 +31803,8 @@
+ fi
+           CFLAGS="$glib_save_CFLAGS"
+           if test $glib_flag_works = yes ; then
+-             G_THREAD_CFLAGS=-$flag
+-	     G_THREAD_LIBS=-$flag
++             G_THREAD_CFLAGS=$flag
++	     G_THREAD_LIBS=$flag
+           fi
+         done
+          ;;
+@@ -31861,6 +31861,9 @@
+ 	*-mingw*)
+ 		# No flag needed when using MSVCRT.DLL
+ 		G_THREAD_CFLAGS=""
++		;;
++	*-darwin*)
++		# Nothing needed.
+ 		;;
+ 	*)
+ 		G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
diff -uNr glib/files/glib-2-macos.patch glib.new/files/glib-2-macos.patch
--- glib/files/glib-2-macos.patch	2005-02-12 22:26:51.000000000 +0100
+++ glib.new/files/glib-2-macos.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
---- glib-2.4.8/configure.orig	Thu Dec  2 15:36:40 2004
-+++ glib-2.4.8/configure	Sat Feb 12 14:28:37 2005
-@@ -31712,9 +31712,9 @@
-          # skip cygwin -pthread or -pthreads test
-          ;;
-       *)
--        for flag in pthread pthreads; do
-+        for flag in '-pthread' '-pthreads' ''; do
-           glib_save_CFLAGS="$CFLAGS"
--          CFLAGS="$CFLAGS -$flag"
-+          CFLAGS="$CFLAGS $flag"
-           if test "$cross_compiling" = yes; then
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -31803,8 +31803,8 @@
- fi
-           CFLAGS="$glib_save_CFLAGS"
-           if test $glib_flag_works = yes ; then
--             G_THREAD_CFLAGS=-$flag
--	     G_THREAD_LIBS=-$flag
-+             G_THREAD_CFLAGS=$flag
-+	     G_THREAD_LIBS=$flag
-           fi
-         done
-          ;;
-@@ -31861,6 +31861,9 @@
- 	*-mingw*)
- 		# No flag needed when using MSVCRT.DLL
- 		G_THREAD_CFLAGS=""
-+		;;
-+	*-darwin*)
-+		# Nothing needed.
- 		;;
- 	*)
- 		G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
diff -uNr glib/glib-2.6.5.ebuild glib.new/glib-2.6.5.ebuild
--- glib/glib-2.6.5.ebuild	2005-09-10 14:05:30.000000000 +0200
+++ glib.new/glib-2.6.5.ebuild	2005-10-16 16:04:33.000000000 +0200
@@ -24,7 +24,7 @@
 
 	unpack ${A}
 	cd ${S}
-	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
+	use ppc-macos && epatch ${FILESDIR}/${P}-macos.patch
 
 	if use ppc64 && use hardened; then
 		replace-flags -O[2-3] -O1
diff -uNr glib/glib-2.8.2.ebuild glib.new/glib-2.8.2.ebuild
--- glib/glib-2.8.2.ebuild	2005-09-27 03:45:19.000000000 +0200
+++ glib.new/glib-2.8.2.ebuild	2005-10-16 16:04:11.000000000 +0200
@@ -25,7 +25,7 @@
 	unpack "${A}"
 	cd "${S}"
 
-	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
+	use ppc-macos && epatch ${FILESDIR}/${P}-macos.patch
 
 	if use ppc64 && use hardened; then
 		replace-flags -O[2-3] -O1