diff options
author | Ross Burton <ross.burton@intel.com> | 2018-07-26 23:44:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:35 +0100 |
commit | 03282a8f5bf00fa7c15dce2f9b06ca5183c44b48 (patch) | |
tree | 6f857377dd377bfe147423f00567673732560d84 | |
parent | 25392f7ed17dd6ce8505aaa4a42063c49b6c430b (diff) | |
download | poky-03282a8f5bf00fa7c15dce2f9b06ca5183c44b48.tar.gz |
ossp-uuid: remove
This project is dead (upstream website doesn't respond anymore) and can mostly
be replaced with the uuid.h in util-linux.
(From OE-Core rev: e187e3da4b72bc667c8badfb5f2de01717d5ea09)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11 files changed, 0 insertions, 461 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4d58766451..6e7efd1275 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -509,7 +509,6 @@ RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo <alejandro.delcasti | |||
509 | RECIPE_MAINTAINER_pn-opkg-utils = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" | 509 | RECIPE_MAINTAINER_pn-opkg-utils = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" |
510 | RECIPE_MAINTAINER_pn-orc = "Maxin B. John <maxin.john@intel.com>" | 510 | RECIPE_MAINTAINER_pn-orc = "Maxin B. John <maxin.john@intel.com>" |
511 | RECIPE_MAINTAINER_pn-os-release = "Ross Burton <ross.burton@intel.com>" | 511 | RECIPE_MAINTAINER_pn-os-release = "Ross Burton <ross.burton@intel.com>" |
512 | RECIPE_MAINTAINER_pn-ossp-uuid = "Alexander Kanavin <alex.kanavin@gmail.com>" | ||
513 | RECIPE_MAINTAINER_pn-ovmf = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" | 512 | RECIPE_MAINTAINER_pn-ovmf = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" |
514 | RECIPE_MAINTAINER_pn-ovmf-shell-image = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" | 513 | RECIPE_MAINTAINER_pn-ovmf-shell-image = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" |
515 | RECIPE_MAINTAINER_pn-p11-kit = "Alexander Kanavin <alex.kanavin@gmail.com>" | 514 | RECIPE_MAINTAINER_pn-p11-kit = "Alexander Kanavin <alex.kanavin@gmail.com>" |
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 deleted file mode 100644 index ed67c501cb..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
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 | ---- | ||
16 | Upstream-Status: Inappropriate [not author] | ||
17 | |||
18 | This patch is from debian ossp-uuid 1.6.2 integration. | ||
19 | |||
20 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
21 | |||
22 | diff --git a/Makefile.in b/Makefile.in | ||
23 | index 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 | ||
43 | diff --git a/perl/Makefile.PL b/perl/Makefile.PL | ||
44 | index 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, | ||
79 | diff --git a/php/config.m4 b/php/config.m4 | ||
80 | index 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 | |||
92 | diff --git a/uuid-config.in b/uuid-config.in | ||
93 | index 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 | * ) | ||
105 | diff --git a/uuid.pc.in b/uuid.pc.in | ||
106 | index 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 | -- | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch deleted file mode 100644 index 804a62731d..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From: Marco Nenciarini <marco.nenciarini@devise.it> | ||
2 | Date: Wed, 27 Jan 2010 19:46:21 +0100 | ||
3 | Subject: [PATCH] uuid: preserve -m option status in -v option handling | ||
4 | |||
5 | Bug: 531396 | ||
6 | --- | ||
7 | uuid_cli.c | 19 ++++++++++--------- | ||
8 | 1 files changed, 10 insertions(+), 9 deletions(-) | ||
9 | |||
10 | ---- | ||
11 | Upstream-Status: Inappropriate [not author] | ||
12 | |||
13 | This patch is from debian ossp-uuid 1.6.2 integration. | ||
14 | |||
15 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
16 | |||
17 | diff --git a/uuid_cli.c b/uuid_cli.c | ||
18 | index d1b0b11..14a67fe 100644 | ||
19 | --- a/uuid_cli.c | ||
20 | +++ b/uuid_cli.c | ||
21 | @@ -140,11 +140,12 @@ int main(int argc, char *argv[]) | ||
22 | i = strtol(optarg, &p, 10); | ||
23 | if (*p != '\0') | ||
24 | usage("invalid argument to option 'v'"); | ||
25 | + version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5); | ||
26 | switch (i) { | ||
27 | - case 1: version = UUID_MAKE_V1; break; | ||
28 | - case 3: version = UUID_MAKE_V3; break; | ||
29 | - case 4: version = UUID_MAKE_V4; break; | ||
30 | - case 5: version = UUID_MAKE_V5; break; | ||
31 | + case 1: version |= UUID_MAKE_V1; break; | ||
32 | + case 3: version |= UUID_MAKE_V3; break; | ||
33 | + case 4: version |= UUID_MAKE_V4; break; | ||
34 | + case 5: version |= UUID_MAKE_V5; break; | ||
35 | default: | ||
36 | usage("invalid version on option 'v'"); | ||
37 | break; | ||
38 | @@ -213,10 +214,10 @@ int main(int argc, char *argv[]) | ||
39 | } | ||
40 | else { | ||
41 | /* encoding */ | ||
42 | - if ( (version == UUID_MAKE_V1 && argc != 0) | ||
43 | - || (version == UUID_MAKE_V3 && argc != 2) | ||
44 | - || (version == UUID_MAKE_V4 && argc != 0) | ||
45 | - || (version == UUID_MAKE_V5 && argc != 2)) | ||
46 | + if ( (version & UUID_MAKE_V1 && argc != 0) | ||
47 | + || (version & UUID_MAKE_V3 && argc != 2) | ||
48 | + || (version & UUID_MAKE_V4 && argc != 0) | ||
49 | + || (version & UUID_MAKE_V5 && argc != 2)) | ||
50 | usage("invalid number of arguments"); | ||
51 | if ((rc = uuid_create(&uuid)) != UUID_RC_OK) | ||
52 | error(1, "uuid_create: %s", uuid_error(rc)); | ||
53 | @@ -232,7 +233,7 @@ int main(int argc, char *argv[]) | ||
54 | if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK) | ||
55 | error(1, "uuid_load: %s", uuid_error(rc)); | ||
56 | } | ||
57 | - if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) { | ||
58 | + if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) { | ||
59 | if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK) | ||
60 | error(1, "uuid_create: %s", uuid_error(rc)); | ||
61 | if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) { | ||
62 | -- | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch deleted file mode 100644 index 13cbb59896..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From: Marco Nenciarini <marco.nenciarini@devise.it> | ||
2 | Date: Tue, 2 Feb 2010 12:16:49 +0100 | ||
3 | Subject: [PATCH] Fix whatis entries | ||
4 | |||
5 | Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages | ||
6 | --- | ||
7 | uuid++.pod | 2 +- | ||
8 | uuid.pod | 2 +- | ||
9 | uuid_cli.pod | 2 +- | ||
10 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
11 | |||
12 | ---- | ||
13 | Upstream-Status: Inappropriate [not author] | ||
14 | |||
15 | This patch is from debian ossp-uuid 1.6.2 integration. | ||
16 | |||
17 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
18 | |||
19 | diff --git a/uuid++.pod b/uuid++.pod | ||
20 | index 8b5a4b1..89c5efb 100644 | ||
21 | --- a/uuid++.pod | ||
22 | +++ b/uuid++.pod | ||
23 | @@ -31,7 +31,7 @@ | ||
24 | |||
25 | =head1 NAME | ||
26 | |||
27 | -B<OSSP uuid> - B<Universally Unique Identifier> (C++ API) | ||
28 | +B<uuid++> - B<Universally Unique Identifier> (C++ API) | ||
29 | |||
30 | =head1 VERSION | ||
31 | |||
32 | diff --git a/uuid.pod b/uuid.pod | ||
33 | index 4ad3742..0179a46 100644 | ||
34 | --- a/uuid.pod | ||
35 | +++ b/uuid.pod | ||
36 | @@ -31,7 +31,7 @@ | ||
37 | |||
38 | =head1 NAME | ||
39 | |||
40 | -B<OSSP uuid> - B<Universally Unique Identifier> | ||
41 | +B<uuid> - B<Universally Unique Identifier> | ||
42 | |||
43 | =head1 VERSION | ||
44 | |||
45 | diff --git a/uuid_cli.pod b/uuid_cli.pod | ||
46 | index ddec6bb..df9dc83 100644 | ||
47 | --- a/uuid_cli.pod | ||
48 | +++ b/uuid_cli.pod | ||
49 | @@ -31,7 +31,7 @@ | ||
50 | |||
51 | =head1 NAME | ||
52 | |||
53 | -B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool> | ||
54 | +B<uuid> - B<Universally Unique Identifier Command-Line Tool> | ||
55 | |||
56 | =head1 VERSION | ||
57 | |||
58 | -- | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch deleted file mode 100644 index bc5e111ee5..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Description: Support dash-less args to from_string. | ||
2 | Author: Tim Retout <diocles@debian.org> | ||
3 | Bug-Debian: http://bugs.debian.org/635607 | ||
4 | |||
5 | The module Data::GUID depends on Data::UUID supporting this behaviour. | ||
6 | |||
7 | ---- | ||
8 | Upstream-Status: Inappropriate [not author] | ||
9 | |||
10 | This patch is from debian ossp-uuid 1.6.2 integration. | ||
11 | |||
12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
13 | |||
14 | --- a/perl/uuid_compat.pm | ||
15 | +++ b/perl/uuid_compat.pm | ||
16 | @@ -93,7 +93,9 @@ | ||
17 | $uuid->import('str', | ||
18 | $str =~ /^0x/ | ||
19 | ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str) | ||
20 | - : $str | ||
21 | + : $str =~ /-/ | ||
22 | + ? $str | ||
23 | + : join '-', unpack('A8 A4 A4 A4 A12', $str) | ||
24 | ); | ||
25 | return $uuid->export('bin'); | ||
26 | } | ||
27 | --- a/perl/uuid_compat.ts | ||
28 | +++ b/perl/uuid_compat.ts | ||
29 | @@ -28,7 +28,7 @@ | ||
30 | ## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part) | ||
31 | ## | ||
32 | |||
33 | -use Test::More tests => 14; | ||
34 | +use Test::More tests => 16; | ||
35 | |||
36 | BEGIN { | ||
37 | use_ok('Data::UUID'); | ||
38 | @@ -53,3 +53,5 @@ | ||
39 | ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8")); | ||
40 | ok($ug->compare($uuid7, $uuid8) == 0); | ||
41 | |||
42 | +ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8")); | ||
43 | +ok($ug->compare($uuid7, $uuid9) == 0); | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch deleted file mode 100644 index 63b80f6a14..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | uuid.pc is generated at build time so should be installed from the current | ||
2 | directory, and not $S. | ||
3 | |||
4 | Upstream-Status: Pending [should be submitted] | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | Index: uuid-1.6.2/Makefile.in | ||
8 | =================================================================== | ||
9 | --- uuid-1.6.2.orig/Makefile.in 2012-11-13 16:58:28.624156000 +0000 | ||
10 | +++ uuid-1.6.2/Makefile.in 2012-11-13 17:05:24.224158670 +0000 | ||
11 | @@ -232,7 +232,7 @@ | ||
12 | $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 | ||
13 | $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ | ||
14 | $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ | ||
15 | - $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ | ||
16 | + $(SHTOOL) install -c -m 644 uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ | ||
17 | $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ | ||
18 | -@if [ ".$(WITH_DCE)" = .yes ]; then \ | ||
19 | echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch deleted file mode 100644 index 4dfc1370c1..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Obey LDFLAGS | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- uuid-1.6.2.orig/Makefile.in | ||
7 | +++ uuid-1.6.2/Makefile.in | ||
8 | @@ -113,15 +113,15 @@ all: $(TARGETS) | ||
9 | @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< | ||
10 | |||
11 | $(LIB_NAME): $(LIB_OBJS) | ||
12 | - @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ | ||
13 | + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ | ||
14 | -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` | ||
15 | |||
16 | $(DCE_NAME): $(DCE_OBJS) | ||
17 | - @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ | ||
18 | + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ | ||
19 | -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` | ||
20 | |||
21 | $(CXX_NAME): $(CXX_OBJS) | ||
22 | - @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ | ||
23 | + @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ | ||
24 | -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` | ||
25 | |||
26 | $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch deleted file mode 100644 index 7f601afab5..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Repect LIBTOOLFLAGS | ||
2 | |||
3 | This add a knob that can be controlled from env to set generic options | ||
4 | for libtool | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: uuid-1.6.2/Makefile.in | ||
10 | =================================================================== | ||
11 | --- uuid-1.6.2.orig/Makefile.in | ||
12 | +++ uuid-1.6.2/Makefile.in | ||
13 | @@ -56,7 +56,7 @@ RM = rm -f | ||
14 | CP = cp | ||
15 | RMDIR = rmdir | ||
16 | SHTOOL = $(S)/shtool | ||
17 | -LIBTOOL = @LIBTOOL@ | ||
18 | +LIBTOOL = @LIBTOOL@ $(LIBTOOLFLAGS) | ||
19 | TRUE = true | ||
20 | POD2MAN = pod2man | ||
21 | PERL = @PERL@ | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch deleted file mode 100644 index 4bc91b86ee..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Remove hardcoded libtool name, fall back to generated name | ||
2 | |||
3 | Upstream-Status: Inappropriate [no upstream] | ||
4 | The project appears to no longer be accepting changes. | ||
5 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
7 | |||
8 | diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in | ||
9 | --- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:37:19.579672930 -0500 | ||
10 | +++ uuid-1.6.2/Makefile.in 2012-05-14 14:37:49.112733787 -0500 | ||
11 | @@ -32,6 +32,7 @@ | ||
12 | VPATH = @srcdir@ | ||
13 | srcdir = @srcdir@ | ||
14 | top_srcdir = @top_srcdir@ | ||
15 | +top_builddir = @top_builddir@ | ||
16 | S = $(srcdir) | ||
17 | C = . | ||
18 | |||
19 | @@ -55,7 +56,7 @@ | ||
20 | CP = cp | ||
21 | RMDIR = rmdir | ||
22 | SHTOOL = $(S)/shtool | ||
23 | -LIBTOOL = $(C)/libtool | ||
24 | +LIBTOOL = @LIBTOOL@ | ||
25 | TRUE = true | ||
26 | POD2MAN = pod2man | ||
27 | PERL = @PERL@ | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch deleted file mode 100644 index d806b5fb70..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | We don't want anything stripped | ||
2 | |||
3 | Upstream-Status: Inappropriate [no upstream] | ||
4 | The project appears to no longer be accepting changes. | ||
5 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
7 | |||
8 | diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in | ||
9 | --- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:42:42.225789456 -0500 | ||
10 | +++ uuid-1.6.2/Makefile.in 2012-05-14 15:03:03.119733400 -0500 | ||
11 | @@ -254,7 +254,7 @@ | ||
12 | -@if [ ".$(WITH_CXX)" = .yes ]; then \ | ||
13 | $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ | ||
14 | fi | ||
15 | - @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ | ||
16 | + @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/ | ||
17 | $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ | ||
18 | -@if [ ".$(WITH_PERL)" = .yes ]; then \ | ||
19 | (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb deleted file mode 100644 index 5d9ca790e9..0000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | SUMMARY = "Universally Unique Identifier (UUID) library" | ||
2 | DESCRIPTION = "OSSP uuid is a ISO-C:1999 application programming interface \ | ||
3 | (API) and corresponding command line interface (CLI) for the generation of \ | ||
4 | DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique \ | ||
5 | Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time \ | ||
6 | and node based), version 3 (name based, MD5), version 4 (random number \ | ||
7 | based) and version 5 (name based, SHA-1)." | ||
8 | DESCRIPTION_uuid = "This package contains a tool to create Universally \ | ||
9 | Unique Identifiers (UUID) from the command-line." | ||
10 | |||
11 | HOMEPAGE = "http://www.ossp.org/pkg/lib/uuid/" | ||
12 | SECTION = "libs" | ||
13 | |||
14 | LICENSE = "MIT" | ||
15 | LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e \ | ||
16 | file://uuid_md5.c;beginline=1;endline=28;md5=9c1f4b2218546deae24c91be1dcf00dd" | ||
17 | |||
18 | PR = "r2" | ||
19 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/o/ossp-uuid/" | ||
20 | |||
21 | SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ | ||
22 | file://0001-Change-library-name.patch \ | ||
23 | file://0002-uuid-preserve-m-option-status-in-v-option-handling.patch \ | ||
24 | file://0003-Fix-whatis-entries.patch \ | ||
25 | file://0004-fix-data-uuid-from-string.patch \ | ||
26 | file://uuid-libtool.patch \ | ||
27 | file://uuid-nostrip.patch \ | ||
28 | file://install-pc.patch \ | ||
29 | file://ldflags.patch \ | ||
30 | file://libtool-tag.patch \ | ||
31 | " | ||
32 | SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" | ||
33 | SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" | ||
34 | |||
35 | S = "${WORKDIR}/uuid-${PV}" | ||
36 | |||
37 | inherit autotools update-alternatives | ||
38 | |||
39 | EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql" | ||
40 | EXTRA_OECONF = "--includedir=${includedir}/ossp" | ||
41 | EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" | ||
42 | |||
43 | do_configure_prepend() { | ||
44 | # This package has a completely custom aclocal.m4, which should be acinclude.m4. | ||
45 | if [ ! -e ${S}/acinclude.m4 ]; then | ||
46 | mv ${S}/aclocal.m4 ${S}/acinclude.m4 | ||
47 | fi | ||
48 | |||
49 | rm -f ${S}/libtool.m4 | ||
50 | } | ||
51 | |||
52 | do_install_append() { | ||
53 | mkdir -p ${D}${includedir}/ossp | ||
54 | mv ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/pkgconfig/ossp-uuid.pc | ||
55 | } | ||
56 | |||
57 | PACKAGES =+ "uuid" | ||
58 | FILES_uuid = "${bindir}/uuid" | ||
59 | FILES_${PN} = "${libdir}/libossp-uuid.so.16*" | ||
60 | FILES_${PN}-dev += "${bindir}/uuid-config" | ||
61 | |||
62 | BBCLASSEXTEND = "native nativesdk" | ||
63 | |||
64 | ALTERNATIVE_${PN}-doc = "uuid.3" | ||
65 | ALTERNATIVE_PRIORITY_${PN}-doc = "200" | ||
66 | ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" | ||