diff options
| author | Eric Anholt <[email protected]> | 2005-10-18 23:36:40 +0000 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2005-10-18 23:36:40 +0000 |
| commit | b83435f53b8dd487d48f1133118f69be87023aef (patch) | |
| tree | d3f5af79c8ee3de3294a4d1d49c9b03a526b07fc | |
| parent | d99c37bca6c53535e748804b15ab5b614aa0da48 (diff) | |
Attempt to fix libGL on FreeBSD, where the library was being built without any
dependencies, breaking builds of third-party software.
| -rwxr-xr-x | bin/mklib | 20 | ||||
| -rw-r--r-- | configs/freebsd-dri | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/bin/mklib b/bin/mklib index c754373e833..77698d36301 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 ;; diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 2096fd070c6..c7d3659e914 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -24,7 +24,7 @@ ASM_SOURCES = # Library/program dependencies LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB) +GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB) GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 |