- Fix after objformat removal

This commit is contained in:
Pav Lucistnik 2007-02-04 18:23:59 +00:00
parent b8acd91048
commit aa55e9f3e1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=184146
2 changed files with 48 additions and 0 deletions

View file

@ -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*)

View file

@ -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