diff options
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.patch | 112 |
1 files changed, 112 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 0000000000..a46e244c8b --- /dev/null +++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch | |||
@@ -0,0 +1,112 @@ | |||
1 | From: Piotr Roszatycki <dexter@debian.org> | ||
2 | Date: Wed, 27 Jan 2010 16:53:11 +0100 | ||
3 | Subject: [PATCH] Change library name | ||
4 | |||
5 | The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's | ||
6 | uuid 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 | diff --git a/Makefile.in b/Makefile.in | ||
16 | index d28f4be..c2ba99d 100644 | ||
17 | --- a/Makefile.in | ||
18 | +++ b/Makefile.in | ||
19 | @@ -62,13 +62,13 @@ PERL = @PERL@ | ||
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 | diff --git a/perl/Makefile.PL b/perl/Makefile.PL | ||
37 | index 92f4494..9c6fee6 100644 | ||
38 | --- a/perl/Makefile.PL | ||
39 | +++ b/perl/Makefile.PL | ||
40 | @@ -33,9 +33,9 @@ use Config; | ||
41 | use ExtUtils::MakeMaker; | ||
42 | |||
43 | # determine source directory | ||
44 | -my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } | ||
45 | - grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) | ||
46 | - or die "no source directory found (where libuuid.la is located)"; | ||
47 | +my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } | ||
48 | + grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) | ||
49 | + or die "no source directory found (where libossp-uuid.la is located)"; | ||
50 | |||
51 | # determine extra build options | ||
52 | my $compat = 0; | ||
53 | @@ -47,15 +47,15 @@ WriteMakefile( | ||
54 | VERSION_FROM => 'uuid.pm', | ||
55 | ABSTRACT_FROM => 'uuid.pod', | ||
56 | PREREQ_PM => {}, | ||
57 | - LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], | ||
58 | + LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], | ||
59 | DEFINE => '', | ||
60 | INC => "-I. -I$srcdir", | ||
61 | PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', | ||
62 | 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod', | ||
63 | ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()), | ||
64 | ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), }, | ||
65 | - MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3', | ||
66 | - ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), }, | ||
67 | + MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm', | ||
68 | + ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), }, | ||
69 | TYPEMAPS => [ 'uuid.tm' ], | ||
70 | test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') }, | ||
71 | NO_META => 1, | ||
72 | diff --git a/php/config.m4 b/php/config.m4 | ||
73 | index 5091b96..969b457 100644 | ||
74 | --- a/php/config.m4 | ||
75 | +++ b/php/config.m4 | ||
76 | @@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then | ||
77 | PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) | ||
78 | AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) | ||
79 | PHP_ADD_LIBPATH([..], ) | ||
80 | - PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) | ||
81 | + PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) | ||
82 | PHP_ADD_INCLUDE([..]) | ||
83 | PHP_SUBST(UUID_SHARED_LIBADD) | ||
84 | |||
85 | diff --git a/uuid-config.in b/uuid-config.in | ||
86 | index 8d2a063..5b58812 100644 | ||
87 | --- a/uuid-config.in | ||
88 | +++ b/uuid-config.in | ||
89 | @@ -121,7 +121,7 @@ do | ||
90 | output_extra="$output_extra $uuid_ldflags" | ||
91 | ;; | ||
92 | --libs) | ||
93 | - output="$output -luuid" | ||
94 | + output="$output -lossp-uuid" | ||
95 | output_extra="$output_extra $uuid_libs" | ||
96 | ;; | ||
97 | * ) | ||
98 | diff --git a/uuid.pc.in b/uuid.pc.in | ||
99 | index c76ad1e..de00c2f 100644 | ||
100 | --- a/uuid.pc.in | ||
101 | +++ b/uuid.pc.in | ||
102 | @@ -36,7 +36,7 @@ Name: OSSP uuid | ||
103 | Description: Universally Unique Identifier (UUID) Library | ||
104 | Version: @UUID_VERSION_RAW@ | ||
105 | URL: http://www.ossp.org/pkg/lib/uuid/ | ||
106 | -Cflags: -I${includedir} | ||
107 | -Libs: -L${libdir} -luuid | ||
108 | +Cflags: -I${includedir}/ossp | ||
109 | +Libs: -L${libdir} -lossp-uuid | ||
110 | Libs.private: @LIBS@ | ||
111 | |||
112 | -- | ||