diff options
| author | pav <pav@FreeBSD.org> | 2007-02-05 02:23:59 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-02-05 02:23:59 +0800 |
| commit | a5ce2174e90c953624c0eaa7fa1f7d767bae8f17 (patch) | |
| tree | 6c39f422bd5e050d066274beebb00b3565489486 /devel | |
| parent | b5f6f05c0e0f76dc50ed88950401ba400c6ccd7c (diff) | |
| download | freebsd-ports-gnome-a5ce2174e90c953624c0eaa7fa1f7d767bae8f17.tar.gz freebsd-ports-gnome-a5ce2174e90c953624c0eaa7fa1f7d767bae8f17.tar.zst freebsd-ports-gnome-a5ce2174e90c953624c0eaa7fa1f7d767bae8f17.zip | |
- Fix after objformat removal
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/readline/files/patch-support-shlib-install | 28 | ||||
| -rw-r--r-- | devel/readline/files/patch-support-shobj-conf | 20 |
2 files changed, 48 insertions, 0 deletions
diff --git a/devel/readline/files/patch-support-shlib-install b/devel/readline/files/patch-support-shlib-install new file mode 100644 index 000000000000..f3ab0d6729bf --- /dev/null +++ b/devel/readline/files/patch-support-shlib-install @@ -0,0 +1,28 @@ +--- support/shlib-install.orig Tue Jan 3 20:06:27 2006 ++++ support/shlib-install Sun Feb 4 19:18:58 2007 +@@ -155,25 +155,11 @@ + + # FreeBSD 3.x and above can have either a.out or ELF shared libraries + freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*) +- if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then + # libname.so -> libname.so.M + ${echo} ${RM} ${INSTALLDIR}/$LINK1 + if [ -z "$uninstall" ]; then + eval $INSTALL_LINK1 + fi +- else +- # libname.so.M -> libname.so.M.N +- ${echo} ${RM} ${INSTALLDIR}/$LINK2 +- if [ -z "$uninstall" ]; then +- eval $INSTALL_LINK2 +- fi +- +- # libname.so -> libname.so.M.N +- ${echo} ${RM} ${INSTALLDIR}/$LINK1 +- if [ -z "$uninstall" ]; then +- eval $INSTALL_LINK1 +- fi +- fi + ;; + + hpux1*) diff --git a/devel/readline/files/patch-support-shobj-conf b/devel/readline/files/patch-support-shobj-conf new file mode 100644 index 000000000000..90413187887e --- /dev/null +++ b/devel/readline/files/patch-support-shobj-conf @@ -0,0 +1,20 @@ +--- support/shobj-conf.orig Tue Apr 11 15:15:43 2006 ++++ support/shobj-conf Sun Feb 4 19:18:20 2007 +@@ -128,17 +128,10 @@ + SHOBJ_CFLAGS=-fpic + SHOBJ_LD='${CC}' + +- if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + + SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' +- else +- SHOBJ_LDFLAGS='-shared' +- +- SHLIB_XLDFLAGS='-R$(libdir)' +- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' +- fi + ;; + + # Darwin/MacOS X |