summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch')
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch119
1 files changed, 119 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
new file mode 100644
index 0000000..ed67c50
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
@@ -0,0 +1,119 @@
1From: Piotr Roszatycki <dexter@debian.org>
2Date: Wed, 27 Jan 2010 16:53:11 +0100
3Subject: [PATCH] Change library name
4
5The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's
6uuid library.
7---
8 Makefile.in | 6 +++---
9 perl/Makefile.PL | 12 ++++++------
10 php/config.m4 | 2 +-
11 uuid-config.in | 2 +-
12 uuid.pc.in | 4 ++--
13 5 files changed, 13 insertions(+), 13 deletions(-)
14
15----
16Upstream-Status: Inappropriate [not author]
17
18This patch is from debian ossp-uuid 1.6.2 integration.
19
20Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
21
22diff --git a/Makefile.in b/Makefile.in
23index d28f4be..c2ba99d 100644
24--- a/Makefile.in
25+++ b/Makefile.in
26@@ -62,13 +62,13 @@ PERL = @PERL@
27 PHP = @PHP@
28 PG_CONFIG = @PG_CONFIG@
29
30-LIB_NAME = libuuid.la
31+LIB_NAME = libossp-uuid.la
32 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
33
34-DCE_NAME = libuuid_dce.la
35+DCE_NAME = libossp-uuid_dce.la
36 DCE_OBJS = uuid_dce.lo $(LIB_OBJS)
37
38-CXX_NAME = libuuid++.la
39+CXX_NAME = libossp-uuid++.la
40 CXX_OBJS = uuid++.lo $(LIB_OBJS)
41
42 PRG_NAME = uuid
43diff --git a/perl/Makefile.PL b/perl/Makefile.PL
44index 92f4494..9c6fee6 100644
45--- a/perl/Makefile.PL
46+++ b/perl/Makefile.PL
47@@ -33,9 +33,9 @@ use Config;
48 use ExtUtils::MakeMaker;
49
50 # determine source directory
51-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
52- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
53- or die "no source directory found (where libuuid.la is located)";
54+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
55+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
56+ or die "no source directory found (where libossp-uuid.la is located)";
57
58 # determine extra build options
59 my $compat = 0;
60@@ -47,15 +47,15 @@ WriteMakefile(
61 VERSION_FROM => 'uuid.pm',
62 ABSTRACT_FROM => 'uuid.pod',
63 PREREQ_PM => {},
64- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
65+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
66 DEFINE => '',
67 INC => "-I. -I$srcdir",
68 PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm',
69 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod',
70 ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()),
71 ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), },
72- MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3',
73- ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), },
74+ MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm',
75+ ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), },
76 TYPEMAPS => [ 'uuid.tm' ],
77 test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') },
78 NO_META => 1,
79diff --git a/php/config.m4 b/php/config.m4
80index 5091b96..969b457 100644
81--- a/php/config.m4
82+++ b/php/config.m4
83@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then
84 PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
85 AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
86 PHP_ADD_LIBPATH([..], )
87- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
88+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
89 PHP_ADD_INCLUDE([..])
90 PHP_SUBST(UUID_SHARED_LIBADD)
91
92diff --git a/uuid-config.in b/uuid-config.in
93index 8d2a063..5b58812 100644
94--- a/uuid-config.in
95+++ b/uuid-config.in
96@@ -121,7 +121,7 @@ do
97 output_extra="$output_extra $uuid_ldflags"
98 ;;
99 --libs)
100- output="$output -luuid"
101+ output="$output -lossp-uuid"
102 output_extra="$output_extra $uuid_libs"
103 ;;
104 * )
105diff --git a/uuid.pc.in b/uuid.pc.in
106index c76ad1e..de00c2f 100644
107--- a/uuid.pc.in
108+++ b/uuid.pc.in
109@@ -36,7 +36,7 @@ Name: OSSP uuid
110 Description: Universally Unique Identifier (UUID) Library
111 Version: @UUID_VERSION_RAW@
112 URL: http://www.ossp.org/pkg/lib/uuid/
113-Cflags: -I${includedir}
114-Libs: -L${libdir} -luuid
115+Cflags: -I${includedir}/ossp
116+Libs: -L${libdir} -lossp-uuid
117 Libs.private: @LIBS@
118
119--