Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/ossp-uuid/files: ossp-uuid-1.6.2-gentoo.patch
Date: Sat, 21 Mar 2009 11:58:46
Message-Id: E1Lkzqc-00074T-QO@stork.gentoo.org
1 dev-zero 09/03/21 11:58:42
2
3 Added: ossp-uuid-1.6.2-gentoo.patch
4 Log:
5 Version bump.
6 (Portage version: 2.1.6.8/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: ossp-uuid-1.6.2-gentoo.patch
15 ===================================================================
16 diff -Naur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
17 --- uuid-1.6.2.orig/Makefile.in 2009-03-21 12:52:49.142847389 +0100
18 +++ uuid-1.6.2/Makefile.in 2009-03-21 12:53:54.201971177 +0100
19 @@ -62,13 +62,13 @@
20 PHP = @PHP@
21 PG_CONFIG = @PG_CONFIG@
22
23 -LIB_NAME = libuuid.la
24 +LIB_NAME = libossp-uuid.la
25 LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
26
27 -DCE_NAME = libuuid_dce.la
28 +DCE_NAME = libossp-uuid_dce.la
29 DCE_OBJS = uuid_dce.lo $(LIB_OBJS)
30
31 -CXX_NAME = libuuid++.la
32 +CXX_NAME = libossp-uuid++.la
33 CXX_OBJS = uuid++.lo $(LIB_OBJS)
34
35 PRG_NAME = uuid
36 @@ -112,15 +112,15 @@
37 @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
38
39 $(LIB_NAME): $(LIB_OBJS)
40 - @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
41 + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
42 -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
43
44 $(DCE_NAME): $(DCE_OBJS)
45 - @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
46 + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
47 -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
48
49 $(CXX_NAME): $(CXX_OBJS)
50 - @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
51 + @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
52 -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
53
54 $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)
55 @@ -253,7 +253,7 @@
56 -@if [ ".$(WITH_CXX)" = .yes ]; then \
57 $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
58 fi
59 - @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
60 + @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
61 $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
62 -@if [ ".$(WITH_PERL)" = .yes ]; then \
63 (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
64 diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4
65 --- uuid-1.6.2.orig/php/config.m4 2009-03-21 12:52:49.142847389 +0100
66 +++ uuid-1.6.2/php/config.m4 2009-03-21 12:53:06.282809038 +0100
67 @@ -33,10 +33,10 @@
68 if test "$PHP_UUID" != "no"; then
69 PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
70 AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
71 - PHP_ADD_LIBPATH([..], )
72 - PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
73 + PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
74 PHP_ADD_INCLUDE([..])
75 PHP_SUBST(UUID_SHARED_LIBADD)
76 + LDFLAGS="$LDFLAGS -L../.libs"
77
78 dnl avoid linking conflict with a potentially existing uuid_create(3) in libc
79 AC_CHECK_FUNC(uuid_create,[
80 diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local
81 --- uuid-1.6.2.orig/php/Makefile.local 2009-03-21 12:52:49.142847389 +0100
82 +++ uuid-1.6.2/php/Makefile.local 2009-03-21 12:53:06.282809038 +0100
83 @@ -42,7 +42,7 @@
84
85 test: build
86 @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \
87 - $(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version
88 + $(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version
89
90 install: build
91 @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
92 diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts
93 --- uuid-1.6.2.orig/php/uuid.ts 2009-03-21 12:52:49.142847389 +0100
94 +++ uuid-1.6.2/php/uuid.ts 2009-03-21 12:53:06.282809038 +0100
95 @@ -36,7 +36,7 @@
96
97 print "++ loading DSO uuid.so (low-level API)\n";
98 if (!extension_loaded('uuid')) {
99 - dl('modules/uuid.so');
100 + dl('uuid.so');
101 }
102
103 print "++ loading PHP uuid.php${php_version} (high-level API)\n";
104 diff -Naur uuid-1.6.2.orig/uuid-config.in uuid-1.6.2/uuid-config.in
105 --- uuid-1.6.2.orig/uuid-config.in 2009-03-21 12:52:49.146166177 +0100
106 +++ uuid-1.6.2/uuid-config.in 2009-03-21 12:53:06.282809038 +0100
107 @@ -121,7 +121,7 @@
108 output_extra="$output_extra $uuid_ldflags"
109 ;;
110 --libs)
111 - output="$output -luuid"
112 + output="$output -lossp-uuid"
113 output_extra="$output_extra $uuid_libs"
114 ;;
115 * )
116 diff -Naur uuid-1.6.2.orig/uuid.pc.in uuid-1.6.2/uuid.pc.in
117 --- uuid-1.6.2.orig/uuid.pc.in 2009-03-21 12:52:49.146166177 +0100
118 +++ uuid-1.6.2/uuid.pc.in 2009-03-21 12:53:06.282809038 +0100
119 @@ -36,7 +36,7 @@
120 Description: Universally Unique Identifier (UUID) Library
121 Version: @UUID_VERSION_RAW@
122 URL: http://www.ossp.org/pkg/lib/uuid/
123 -Cflags: -I${includedir}
124 -Libs: -L${libdir} -luuid
125 +Cflags: -I${includedir}/ossp
126 +Libs: -L${libdir} -lossp-uuid
127 Libs.private: @LIBS@
Report Message
Find on MARC Find on Google Groups