diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-08-24 21:59:07 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-08-24 21:59:07 +0000 |
| commit | e0599280baada500d5ed736cf987da694077f343 (patch) | |
| tree | 9b45dbafed1c609c1317691f9242212b29be5f58 /net-libs/canlock | |
| parent | Add patch from OpenSuSE to get rid of an implicit function declaration, bug 4... (diff) | |
| download | historical-e0599280baada500d5ed736cf987da694077f343.tar.gz historical-e0599280baada500d5ed736cf987da694077f343.tar.bz2 historical-e0599280baada500d5ed736cf987da694077f343.zip | |
Respect cflags and ldflags (bug #432622).
Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64
Diffstat (limited to 'net-libs/canlock')
| -rw-r--r-- | net-libs/canlock/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/canlock/Manifest | 26 | ||||
| -rw-r--r-- | net-libs/canlock/files/canlock-2b-make.patch | 26 |
3 files changed, 44 insertions, 15 deletions
diff --git a/net-libs/canlock/ChangeLog b/net-libs/canlock/ChangeLog index 9437c59bc85e..761c64824c41 100644 --- a/net-libs/canlock/ChangeLog +++ b/net-libs/canlock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/canlock -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.3 2011/10/10 18:35:03 grobian Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.4 2012/08/24 21:59:07 radhermit Exp $ + + 24 Aug 2012; Tim Harder <radhermit@gentoo.org> files/canlock-2b-make.patch: + Respect cflags and ldflags (bug #432622). 10 Oct 2011; Fabian Groffen <grobian@gentoo.org> canlock-2b.ebuild: Marked ~{amd64,x86}-linux, bug #385065 diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest index e4dbfc967918..d75b6404a367 100644 --- a/net-libs/canlock/Manifest +++ b/net-libs/canlock/Manifest @@ -1,16 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX canlock-2b-make.patch 1212 RMD160 04e5fa1318675dd12765bba90039d6ae7c28c38f SHA1 d190b960b702a90014a6256a4b87a811d82d19a1 SHA256 9426b556f77d45cd56eb6c05cbdbd24cdb9a9b099c31940fdac670301b27f7ab -DIST canlock_2b-6.diff.gz 7946 RMD160 a894099ade6d0e91bfb48b2e383070d5864d4de2 SHA1 46a6829f975ddd9b567c6f6793ff894bf4632e76 SHA256 fd08c6d5fc8f2934248a86affec404d5c0b3d360dc9b810389ec7a2c193ff502 -DIST canlock_2b.orig.tar.gz 14099 RMD160 ce0528b159c4395eda29b1f8f0d76223c95aa8dd SHA1 42c71c47d0e0eb06fa1259cfd5039805feaf4042 SHA256 90234e47727dfd9782b79e05b6efa879d2792ad8feb46788b583032a71af0da7 -EBUILD canlock-2b.ebuild 1116 RMD160 9aff40e1eee1a9f20c40f47e8576a566bbd93d0c SHA1 421970e9915dadfdb0b4c180ce0e504960405840 SHA256 a0b817eeef3e1ad1515c9c72620dd311860dfe4d66cfc54be1452102aa03718b -MISC ChangeLog 590 RMD160 d380c23110424b1ed195009d9dd51dff74723671 SHA1 23b96b1ee4d526714810f84615b1649aa14dce9b SHA256 bbadc89d14bc38ec3c42b7218b0b4dab910cccd36cfc58ec8df8dce7d698062a -MISC metadata.xml 255 RMD160 9f6ad82c0a8f9181988cda72fc8760a147461d4b SHA1 25e6c58a05c98ba4be21205ce4af4620b1ba98ca SHA256 90a28f7a04b3cfd2510dce1e8d8f24377251f3b4cc7b944f8d757ec3f76b0841 +AUX canlock-2b-make.patch 1889 SHA256 4ab05559a1ccc08f099d9d6d9038833748bd5c07cd75826c4f03a3f59dc91069 SHA512 9ddb97f9240c793ad131d900635b867b8bac629b2889bd6131e489709054b9faef7a2caef32d0c719ecde5bfacffee01c7ab7f4dd3a71b0d6d92fa8fc2c74f4f WHIRLPOOL bc919a1802a2b49eefd3bce4ce435a85b49936f7ced54127d71b588be9e2579defabc8bf869cb71cb24e9eabde32f3231bd184f47c41a72dce48e5eab3fb9396 +DIST canlock_2b-6.diff.gz 7946 SHA256 fd08c6d5fc8f2934248a86affec404d5c0b3d360dc9b810389ec7a2c193ff502 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f WHIRLPOOL 0277808d414c4b06f23b697373ec6207ffc22404550a493b2be6ce43b2b13a1042e461b16f6efbd540a7a5bccc20286224d6afe2b4c572b979198f8a3e5381d5 +DIST canlock_2b.orig.tar.gz 14099 SHA256 90234e47727dfd9782b79e05b6efa879d2792ad8feb46788b583032a71af0da7 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e WHIRLPOOL 7f48d62dd29e89f4745cdb09c5f6d4600dc402b8cc327bbfa2b2d8b62ab940426a1e44fac93a64fdf471aecedbd14610c3fa83e0f36fc936edf140305f281b28 +EBUILD canlock-2b.ebuild 1116 SHA256 a0b817eeef3e1ad1515c9c72620dd311860dfe4d66cfc54be1452102aa03718b SHA512 15ec8951fdc3c2b30d46dd43e0dceb5cbd11cf342c8400e3d78803c91d688734d28a2d24d287b3088e0169d2fd7f07efba1326ff2050057c45c51d4411477de8 WHIRLPOOL d8efe3c266e46cfcf2174d3fb3d354ec36e6a683f883a9381b03b35f3c1513bb5fdd6627f2fbaf395bdde098fc98a8c6551ac09b042fece2d289924237047d16 +MISC ChangeLog 715 SHA256 9cb0983858a7eecdf63ea749cd4702b94e5cb914d27072688abd7d9fd64ab030 SHA512 b3e245d6c75ba83cebb369d52bb47e7ecb7408cb6309202c33cac04aba7b68d17cdb0520dd8688457f5e487c8100aa10158baf0eed78b2e69f3e48ccc7564b97 WHIRLPOOL bfb54ff365553c140430c629010b967a54505d5e0b609f3ea518ede22b4f23e2effa9143b2a2aa57e6b2b8beb976ad66a0827639ee8f85cd222d8dc8d9f408b7 +MISC metadata.xml 255 SHA256 90a28f7a04b3cfd2510dce1e8d8f24377251f3b4cc7b944f8d757ec3f76b0841 SHA512 db4564d2c92e00c2fa72a6a549657be2774620c77436a1556c3a616503e371d0696ca9f2fbfd7be94a7f637e17f9bd3f93c2dafd15df596d364048c533da2107 WHIRLPOOL f2620584582b7b2dd1c2e0f127d34bc244d25d4e16abc3e77f708ee072fe88ad4a83a6e42859c374fbd5627b95bef9b16a3ee45f56c3fb102720f443d9501cc2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (Darwin) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk6TOtwACgkQX3X2B8XHTom1qACgg3r6q3AfucXdtIOKfPs0K8zq -6j4AnRjIm6q4gqiwSVvIN/JpGc6QRjHA -=f+5j +iQEcBAEBCAAGBQJQN/k0AAoJEEqz6FtPBkyj2QwH/RpqwKFJcCAXCJ8jG7AISrA5 +KMRWgTpQjmJVo/1G9XBKZKrYub2uha5Rpm25fZnWOlExZzWEJtLSZR+NK/85KBYI +jahefILZWO4yigJNNwbbD2Mc1EsGfV5kQoOaRKfMuPW9PWHtU9v3Tct5tGgPx/AF +/EtEpBhJJRFK54cD9fsRVLf4QwqdZdjuXJe/tNpmW7puZ810WBS48aN8XOfkOWcD +Vu5uix8dsMVRpFWsjGvoolJD9aTelfQ8denwKFFB/Ny/fy/NkkR2s5b+5QRR7eHY +5/0kbHHJR29SktFF2jWNYjtlAA9igM7Kl7333gYzvfpJKhCFKEFNHnwaZkobwaw= +=1EQs -----END PGP SIGNATURE----- diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch index 5ea34530cebd..4f26d25f7812 100644 --- a/net-libs/canlock/files/canlock-2b-make.patch +++ b/net-libs/canlock/files/canlock-2b-make.patch @@ -1,5 +1,13 @@ --- canlock2b.orig/Makefile +++ canlock2b/Makefile +@@ -1,5 +1,5 @@ +-CFLAGS = -Iinclude +-LDFLAGS = -L. -lcanlock ++CFLAGS += -Iinclude ++LDFLAGS += -L. -lcanlock + CC = gcc + STATIC_LIB = libcanlock.a + @@ -15,16 +15,17 @@ $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) @@ -23,7 +31,16 @@ test: all --- canlock2b.orig/src/Makefile +++ canlock2b/src/Makefile -@@ -13,8 +13,8 @@ +@@ -1,7 +1,7 @@ + LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo + CC = gcc + LIBTOOL = libtool +-CFLAGS = -I../include ++CFLAGS += -I../include + SOURCES = base64.c canlock.c hmac_sha1.c sha1.c + OBJS = base64.o canlock.o hmac_sha1.o sha1.o + SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2 +@@ -13,20 +13,20 @@ libcanlock.a: $(CC) $(CFLAGS) -c $(SOURCES) @@ -34,7 +51,12 @@ rm $(OBJS) libcanlock.so.2.0.0: -@@ -26,7 +26,7 @@ + $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) +- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 ++ $(CC) -shared $(OBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 + + install: all + $(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2 cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so $(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a |