The PHP specific part of ossp-uuid-1.6.2-gentoo.patch

ossp-uuid-1.6.2-php.patch (text/plain), 1.72 KB, created by Ole Markus With (RETIRED) on 2011-03-19 14:46:29 UTC

diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4
--- uuid-1.6.2.orig/php/config.m4	2009-03-21 12:52:49.142847389 +0100
+++ uuid-1.6.2/php/config.m4	2009-03-21 12:53:06.282809038 +0100
@@ -33,10 +33,10 @@
 if test "$PHP_UUID" != "no"; then
     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
-    PHP_ADD_LIBPATH([..], )
-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
-    PHP_ADD_INCLUDE([..])
+    PHP_ADD_INCLUDE([../uuid-1.6.2])
     PHP_SUBST(UUID_SHARED_LIBADD)
+    LDFLAGS="$LDFLAGS -L../uuid-1.6.2/.libs"
 
     dnl  avoid linking conflict with a potentially existing uuid_create(3) in libc
     AC_CHECK_FUNC(uuid_create,[
diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local
--- uuid-1.6.2.orig/php/Makefile.local	2009-03-21 12:52:49.142847389 +0100
+++ uuid-1.6.2/php/Makefile.local	2009-03-21 12:53:06.282809038 +0100
@@ -42,7 +42,7 @@
 
 test: build
 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \
-	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version
+	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version
 
 install: build
 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts
--- uuid-1.6.2.orig/php/uuid.ts	2009-03-21 12:52:49.142847389 +0100
+++ uuid-1.6.2/php/uuid.ts	2009-03-21 12:53:06.282809038 +0100
@@ -36,7 +36,7 @@
 
 print "++ loading DSO uuid.so (low-level API)\n";
 if (!extension_loaded('uuid')) {
-    dl('modules/uuid.so');
+    dl('uuid.so');
 }
 
 print "++ loading PHP uuid.php${php_version} (high-level API)\n";