OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix libGL on FreeBSD, where the library was being built without any

Browse Source 
dependencies, breaking builds of third-party software.
This commit is contained in:
Eric Anholt
2005-10-18 23:36:40 +00:00
parent d99c37bca6
commit b83435f53b
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/mklib
View File

@@ -307,11 +307,23 @@ case $ARCH in
;; ;;
'FreeBSD') '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 if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part # No "lib" or ".so" part
echo "mklib: Making FreeBSD shared library: " ${LIBNAME} echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
OPTS="-shared"
rm -f ${LIBNAME} rm -f ${LIBNAME}
ld -Bshareable -o ${LIBNAME} ${OBJECTS} ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME} FINAL_LIBS=${LIBNAME}
elif [ $STATIC = 1 ] ; then elif [ $STATIC = 1 ] ; then
STLIB="lib${LIBNAME}.a" STLIB="lib${LIBNAME}.a"
@@ -321,11 +333,11 @@ case $ARCH in
ranlib ${STLIB} ranlib ${STLIB}
FINAL_LIBS=${STLIB} FINAL_LIBS=${STLIB}
else else
SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}" SHLIB="lib${LIBNAME}.so.${MAJOR}"
OPTS="-shared -Wl,-soname,${SHLIB}"
echo "mklib: Making FreeBSD shared library: " ${SHLIB} echo "mklib: Making FreeBSD shared library: " ${SHLIB}
rm -f ${SHLIB} rm -f ${SHLIB}
ld -Bshareable -o ${SHLIB} ${OBJECTS} ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
# XXX make lib${LIBNAME}.so.${MAJOR} symlink?
FINAL_LIBS=${SHLIB} FINAL_LIBS=${SHLIB}
fi fi
;; ;;

2
configs/freebsd-dri
View File

@@ -24,7 +24,7 @@ ASM_SOURCES =
# Library/program dependencies # Library/program dependencies
LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) 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 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 GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11