From b83435f53b8dd487d48f1133118f69be87023aef Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 18 Oct 2005 23:36:40 +0000 Subject: Attempt to fix libGL on FreeBSD, where the library was being built without any dependencies, breaking builds of third-party software. --- bin/mklib | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/mklib b/bin/mklib index c754373e83..77698d3630 100755 --- a/bin/mklib +++ b/bin/mklib @@ -307,11 +307,23 @@ case $ARCH in ;; 'FreeBSD') + # we assume gcc + + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then + LINK=g++ + else + LINK=gcc + fi + fi + if [ $NOPREFIX = 1 ] ; then # No "lib" or ".so" part echo "mklib: Making FreeBSD shared library: " ${LIBNAME} + OPTS="-shared" rm -f ${LIBNAME} - ld -Bshareable -o ${LIBNAME} ${OBJECTS} + ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS} FINAL_LIBS=${LIBNAME} elif [ $STATIC = 1 ] ; then STLIB="lib${LIBNAME}.a" @@ -321,11 +333,11 @@ case $ARCH in ranlib ${STLIB} FINAL_LIBS=${STLIB} else - SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}" + SHLIB="lib${LIBNAME}.so.${MAJOR}" + OPTS="-shared -Wl,-soname,${SHLIB}" echo "mklib: Making FreeBSD shared library: " ${SHLIB} rm -f ${SHLIB} - ld -Bshareable -o ${SHLIB} ${OBJECTS} - # XXX make lib${LIBNAME}.so.${MAJOR} symlink? + ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS} FINAL_LIBS=${SHLIB} fi ;; -- cgit v1.2.3