| From: Piotr Roszatycki <dexter@debian.org> |
| Date: Wed, 27 Jan 2010 16:53:11 +0100 |
| Subject: [PATCH] Change library name |
| |
| The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's |
| uuid library. |
| --- |
| Makefile.in | 6 +++--- |
| perl/Makefile.PL | 12 ++++++------ |
| php/config.m4 | 2 +- |
| uuid-config.in | 2 +- |
| uuid.pc.in | 4 ++-- |
| 5 files changed, 13 insertions(+), 13 deletions(-) |
| |
| ---- |
| Upstream-Status: Inappropriate [not author] |
| |
| This patch is from debian ossp-uuid 1.6.2 integration. |
| |
| Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| |
| diff --git a/Makefile.in b/Makefile.in |
| index d28f4be..c2ba99d 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -62,13 +62,13 @@ PERL = @PERL@ |
| PHP = @PHP@ |
| PG_CONFIG = @PG_CONFIG@ |
| |
| -LIB_NAME = libuuid.la |
| +LIB_NAME = libossp-uuid.la |
| 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 |
| |
| -DCE_NAME = libuuid_dce.la |
| +DCE_NAME = libossp-uuid_dce.la |
| DCE_OBJS = uuid_dce.lo $(LIB_OBJS) |
| |
| -CXX_NAME = libuuid++.la |
| +CXX_NAME = libossp-uuid++.la |
| CXX_OBJS = uuid++.lo $(LIB_OBJS) |
| |
| PRG_NAME = uuid |
| diff --git a/perl/Makefile.PL b/perl/Makefile.PL |
| index 92f4494..9c6fee6 100644 |
| --- a/perl/Makefile.PL |
| +++ b/perl/Makefile.PL |
| @@ -33,9 +33,9 @@ use Config; |
| use ExtUtils::MakeMaker; |
| |
| # determine source directory |
| -my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } |
| - grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) |
| - or die "no source directory found (where libuuid.la is located)"; |
| +my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } |
| + grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) |
| + or die "no source directory found (where libossp-uuid.la is located)"; |
| |
| # determine extra build options |
| my $compat = 0; |
| @@ -47,15 +47,15 @@ WriteMakefile( |
| VERSION_FROM => 'uuid.pm', |
| ABSTRACT_FROM => 'uuid.pod', |
| PREREQ_PM => {}, |
| - LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], |
| + LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], |
| DEFINE => '', |
| INC => "-I. -I$srcdir", |
| PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', |
| 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod', |
| ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()), |
| ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), }, |
| - MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3', |
| - ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), }, |
| + MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm', |
| + ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), }, |
| TYPEMAPS => [ 'uuid.tm' ], |
| test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') }, |
| NO_META => 1, |
| diff --git a/php/config.m4 b/php/config.m4 |
| index 5091b96..969b457 100644 |
| --- a/php/config.m4 |
| +++ b/php/config.m4 |
| @@ -34,7 +34,7 @@ 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_SUBST(UUID_SHARED_LIBADD) |
| |
| diff --git a/uuid-config.in b/uuid-config.in |
| index 8d2a063..5b58812 100644 |
| --- a/uuid-config.in |
| +++ b/uuid-config.in |
| @@ -121,7 +121,7 @@ do |
| output_extra="$output_extra $uuid_ldflags" |
| ;; |
| --libs) |
| - output="$output -luuid" |
| + output="$output -lossp-uuid" |
| output_extra="$output_extra $uuid_libs" |
| ;; |
| * ) |
| diff --git a/uuid.pc.in b/uuid.pc.in |
| index c76ad1e..de00c2f 100644 |
| --- a/uuid.pc.in |
| +++ b/uuid.pc.in |
| @@ -36,7 +36,7 @@ Name: OSSP uuid |
| Description: Universally Unique Identifier (UUID) Library |
| Version: @UUID_VERSION_RAW@ |
| URL: http://www.ossp.org/pkg/lib/uuid/ |
| -Cflags: -I${includedir} |
| -Libs: -L${libdir} -luuid |
| +Cflags: -I${includedir}/ossp |
| +Libs: -L${libdir} -lossp-uuid |
| Libs.private: @LIBS@ |
| |
| -- |