]> git.pld-linux.org Git - packages/ossp-uuid.git/blame - uuid-ossp-prefix.patch
projects / packages / ossp-uuid.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 11
[packages/ossp-uuid.git] / uuid-ossp-prefix.patch
CommitLineData
85806793
ER		 1diff -up uuid-1.6.1/uuid-config.in.BAD uuid-1.6.1/uuid-config.in
2--- uuid-1.6.1/uuid-config.in.BAD 2008-03-06 11:56:13.000000000 -0500
3+++ uuid-1.6.1/uuid-config.in 2008-03-06 11:56:25.000000000 -0500
4@@ -121,7 +121,7 @@ do
5 output_extra="$output_extra $uuid_ldflags"
6 ;;
7 --libs)
8- output="$output -luuid"
9+ output="$output -lossp-uuid"
10 output_extra="$output_extra $uuid_libs"
11 ;;
12 * )
13diff -up uuid-1.6.1/Makefile.in.BAD uuid-1.6.1/Makefile.in
14--- uuid-1.6.1/Makefile.in.BAD 2008-03-06 11:10:13.000000000 -0500
15+++ uuid-1.6.1/Makefile.in 2008-03-06 11:11:39.000000000 -0500
16@@ -62,13 +62,13 @@ PERL = @PERL@
17 PHP = @PHP@
18 PG_CONFIG = @PG_CONFIG@
19
20-LIB_NAME = libuuid.la
21+LIB_NAME = libossp-uuid.la
22 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
23
24-DCE_NAME = libuuid_dce.la
25+DCE_NAME = libossp-uuid_dce.la
26 DCE_OBJS = uuid_dce.lo $(LIB_OBJS)
27
28-CXX_NAME = libuuid++.la
29+CXX_NAME = libossp-uuid++.la
30 CXX_OBJS = uuid++.lo $(LIB_OBJS)
31
32 PRG_NAME = uuid
33@@ -79,10 +79,10 @@ MAN_NAME = uuid.3 uuid++.3 uuid.1
34 PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm
35 PERL_OBJS = $(S)/perl/uuid.pm
36
37-PHP_NAME = $(S)/php/modules/uuid.so
38+PHP_NAME = $(S)/php/modules/ossp-uuid.so
39 PHP_OBJS = $(S)/php/uuid.c
40
41-PGSQL_NAME = $(S)/pgsql/libuuid.so
42+PGSQL_NAME = $(S)/pgsql/libossp-uuid.so
43 PGSQL_OBJS = $(S)/pgsql/uuid.c
44
45 TARGETS = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@
46@@ -231,7 +231,7 @@ install:
47 $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
48 $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
49 $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
50- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
51+ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
52 $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
53 -@if [ ".$(WITH_DCE)" = .yes ]; then \
54 echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
55@@ -241,7 +241,7 @@ install:
56 echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
57 $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
58 fi
59- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
60+ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
61 -@if [ ".$(WITH_CXX)" = .yes ]; then \
62 echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
63 $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
64@@ -276,7 +276,7 @@ uninstall:
65 -@if [ ".$(WITH_CXX)" = .yes ]; then \
66 $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
67 fi
68- -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
69+ -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
70 -@if [ ".$(WITH_CXX)" = .yes ]; then \
71 echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
72 $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
73@@ -290,7 +290,7 @@ uninstall:
74 echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
75 $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
76 fi
77- -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
78+ -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
79 -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
80 -$(RM) $(DESTDIR)$(bindir)/uuid-config
81 -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
82diff -up uuid-1.6.1/pgsql/Makefile.BAD uuid-1.6.1/pgsql/Makefile
83--- uuid-1.6.1/pgsql/Makefile.BAD 2008-03-06 11:53:26.000000000 -0500
84+++ uuid-1.6.1/pgsql/Makefile 2008-03-06 11:54:14.000000000 -0500
85@@ -18,13 +18,13 @@ POSTGRES := $(shell $(PG_CONFIG
86 top_builddir := $(dir $(PGXS))../..
87 include $(top_builddir)/src/Makefile.global
88
89-NAME = uuid
90+NAME = ossp-uuid
91 OBJS = uuid.o
92 SO_MAJOR_VERSION = 1
93 SO_MINOR_VERSION = 0
94
95 override CPPFLAGS := -I.. $(CPPFLAGS)
96-SHLIB_LINK := -L../.libs -luuid
97+SHLIB_LINK := -L../.libs -lossp-uuid
98 SHLIB_LINK += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
99 SHLIB_LINK += $(shell test $(shell uname -s) = Darwin && echo "-bundle_loader $(POSTGRES)")
100 rpath :=
101@@ -35,16 +35,16 @@ enable_shared = yes
102 include $(top_builddir)/src/Makefile.shlib
103
104 uuid.sql: uuid.sql.in
105- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
106+ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
107
108 install: all
109 $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
110 $(mkinstalldirs) $(DESTDIR)$(datadir)
111- $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
112+ $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
113 $(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql
114
115 uninstall:
116- -rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
117+ -rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
118 -rm -f $(DESTDIR)$(datadir)/uuid.sql
119
120 clean distclean: clean-lib
121diff -up uuid-1.6.1/uuid.pc.in.BAD uuid-1.6.1/uuid.pc.in
122--- uuid-1.6.1/uuid.pc.in.BAD 2008-03-06 11:57:29.000000000 -0500
123+++ uuid-1.6.1/uuid.pc.in 2008-03-06 11:57:36.000000000 -0500
124@@ -37,6 +37,6 @@ Description: Universally Unique Identifi
125 Version: @UUID_VERSION_RAW@
126 URL: http://www.ossp.org/pkg/lib/uuid/
127 Cflags: -I${includedir}
128-Libs: -L${libdir} -luuid
129+Libs: -L${libdir} -lossp-uuid
130 Libs.private: @LIBS@
131
132diff -up uuid-1.6.1/perl/Makefile.PL.BAD uuid-1.6.1/perl/Makefile.PL
133--- uuid-1.6.1/perl/Makefile.PL.BAD 2008-03-06 11:12:05.000000000 -0500
134+++ uuid-1.6.1/perl/Makefile.PL 2008-03-06 11:49:25.000000000 -0500
135@@ -33,9 +33,9 @@ use Config;
136 use ExtUtils::MakeMaker;
137
138 # determine source directory
139-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
140- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
141- or die "no source directory found (where libuuid.la is located)";
142+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
143+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
144+ or die "no source directory found (where libossp-uuid.la is located)";
145
146 # determine extra build options
147 my $compat = 0;
148@@ -47,7 +47,7 @@ WriteMakefile(
149 VERSION_FROM => 'uuid.pm',
150 ABSTRACT_FROM => 'uuid.pod',
151 PREREQ_PM => {},
152- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
153+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
154 DEFINE => '',
155 INC => "-I. -I$srcdir",
156 PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm',
157diff -up uuid-1.6.1/Makefile.PL.BAD uuid-1.6.1/Makefile.PL
158--- uuid-1.6.1/Makefile.PL.BAD 2008-03-06 11:09:49.000000000 -0500
159+++ uuid-1.6.1/Makefile.PL 2008-03-06 11:10:01.000000000 -0500
160@@ -44,7 +44,7 @@ ARGS = $ARGS
161 all pure_all:
162 \@if [ ! -d build ]; then mkdir build; fi
163 \@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi
164- \@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi
165+ \@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi
166 \@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
167 \@cd perl && \$(MAKE) \$(MFLAGS) \$\@
168
169diff -up uuid-1.6.1/php/config.m4.BAD uuid-1.6.1/php/config.m4
170--- uuid-1.6.1/php/config.m4.BAD 2008-03-06 11:54:55.000000000 -0500
171+++ uuid-1.6.1/php/config.m4 2008-03-06 11:55:07.000000000 -0500
172@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then
173 PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
174 AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
3532085f 175- PHP_ADD_LIBPATH([..], )
176+ PHP_ADD_LIBPATH([../.libs], )
85806793
ER		 177- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
178+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
179 PHP_ADD_INCLUDE([..])
180 PHP_SUBST(UUID_SHARED_LIBADD)
181
182diff -up uuid-1.6.1/php/Makefile.local.BAD uuid-1.6.1/php/Makefile.local
183--- uuid-1.6.1/php/Makefile.local.BAD 2008-03-06 11:54:39.000000000 -0500
184+++ uuid-1.6.1/php/Makefile.local 2008-03-06 11:54:49.000000000 -0500
185@@ -48,7 +48,7 @@ install: build
186 @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
187 echo "installing PHP$$version API into $$extdir"; \
188 ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
189- ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
190+ ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \
191 ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
192
193 clean:
194diff -up uuid-1.6.1/php/uuid.ts.BAD uuid-1.6.1/php/uuid.ts
195--- uuid-1.6.1/php/uuid.ts.BAD 2008-03-06 11:55:38.000000000 -0500
196+++ uuid-1.6.1/php/uuid.ts 2008-03-06 11:56:03.000000000 -0500
197@@ -34,9 +34,9 @@
198
199 $php_version = $argv[1];
200
201-print "++ loading DSO uuid.so (low-level API)\n";
202+print "++ loading DSO ossp-uuid.so (low-level API)\n";
203 if (!extension_loaded('uuid')) {
204- dl('modules/uuid.so');
205+ dl('modules/ossp-uuid.so');
206 }
207
208 print "++ loading PHP uuid.php${php_version} (high-level API)\n";
Universally Unique Identifier library
This page took 0.130908 seconds and 4 git commands to generate.