| 1 |
grobian 11/12/03 13:29:58 |
| 2 |
|
| 3 |
Added: nettle-2.4-darwin-shlink.patch |
| 4 |
Log: |
| 5 |
Add patch to fix compilation on Darwin, marked ~x64-macos |
| 6 |
|
| 7 |
(Portage version: 2.2.01.19824-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nettle-2.4-darwin-shlink.patch |
| 16 |
=================================================================== |
| 17 |
From MacPorts: |
| 18 |
https://trac.macports.org/browser/trunk/dports/devel/nettle/files/patch-configure.diff |
| 19 |
|
| 20 |
nettle: move -L. before $(LDFLAGS) (which will contain -L${prefix}/lib) |
| 21 |
so future updates when the new and old libraries are incompatible don't |
| 22 |
go awry |
| 23 |
|
| 24 |
Reworked by Gentoo for configure.ac |
| 25 |
|
| 26 |
Fixes in particular the linking stage on Darwin, using the right |
| 27 |
dependency libs, and creating the right names. |
| 28 |
|
| 29 |
Fixed incorrect -gmp argument in LIBS (probably typo) |
| 30 |
|
| 31 |
|
| 32 |
--- configure.ac |
| 33 |
+++ configure.ac |
| 34 |
@@ -61,9 +61,8 @@ |
| 35 |
[enable_gcov=no]) |
| 36 |
|
| 37 |
LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ |
| 38 |
- `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \ |
| 39 |
- /usr/local/lib /sw/local/lib /sw/lib \ |
| 40 |
- /usr/gnu/lib /opt/gnu/lib /sw/gnu/lib /usr/freeware/lib /usr/pkg/lib]) |
| 41 |
+ `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed |
| 42 |
+"s@^NONE@$ac_default_prefix/lib@g"`]) |
| 43 |
|
| 44 |
# Checks for programs. |
| 45 |
AC_PROG_CC |
| 46 |
@@ -281,16 +280,16 @@ |
| 47 |
;; |
| 48 |
darwin*) |
| 49 |
LIBNETTLE_FORLINK=libnettle.dylib |
| 50 |
- LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' |
| 51 |
- LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' |
| 52 |
- LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS)' |
| 53 |
- LIBNETTLE_LIBS='' |
| 54 |
+ LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR).dylib' |
| 55 |
+ LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR).dylib' |
| 56 |
+ LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS) -install_name ${libdir}/$(LIBNETTLE_SONAME) -compatibility_version $(LIBNETTLE_MAJOR) -current_version $(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)' |
| 57 |
+ LIBNETTLE_LIBS='$(LIBS)' |
| 58 |
|
| 59 |
LIBHOGWEED_FORLINK=libhogweed.dylib |
| 60 |
- LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' |
| 61 |
- LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' |
| 62 |
- LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)' |
| 63 |
- LIBHOGWEED_LIBS='' |
| 64 |
+ LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib' |
| 65 |
+ LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib' |
| 66 |
+ LIBHOGWEED_LINK='$(CC) -dynamiclib -L. $(LDFLAGS) -install_name ${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR) -current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)' |
| 67 |
+ LIBHOGWEED_LIBS='$(LIBS) -lnettle' |
| 68 |
;; |
| 69 |
solaris*) |
| 70 |
# Sun's ld uses -h to set the soname, and this option is passed |
Archives