qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generate a correct libfontconfig.la on static only architectures.

Browse Source
This commit is contained in:
matthieu 2013-04-25 06:53:38 +00:00
parent b661ecfd0d
commit 08c8ef950a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/fontconfig/src/Makefile
View File

@ -1,4 +1,6 @@
# $OpenBSD: Makefile,v 1.4 2013/03/17 20:46:47 matthieu Exp $ # $OpenBSD: Makefile,v 1.5 2013/04/25 06:53:38 matthieu Exp $
.include <bsd.xconf.mk>
FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
@ -65,11 +67,17 @@ fcobjshash.h: fcobjshash.gperf
beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes"
lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
@sed -e 's#@libdir@#${LIBDIR}#g' \ sed -e 's#@libdir@#${LIBDIR}#g' \
-e 's#@major@#${SHLIB_MAJOR}#g' \ -e 's#@sharedlibfontconfig@#libfontconfig.so.${SHLIB_MAJOR}.${SHLIB_MINOR}#g' \
-e 's#@minor@#${SHLIB_MINOR}#g' \
< $? > $@ < $? > $@
.else
lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
sed -e 's#@libdir@#${LIBDIR}#g' \
-e 's#@sharedlibfontconfig@##g' \
< $? > $@
.endif
afterinstall: afterinstall:
${INSTALL_DATA} lib${LIB}.la ${DESTDIR}${LIBDIR} ${INSTALL_DATA} lib${LIB}.la ${DESTDIR}${LIBDIR}

4
lib/fontconfig/src/libfontconfig.la.in
View File

@ -5,10 +5,10 @@
# It is necessary for linking the library. # It is necessary for linking the library.
# The name that we can dlopen(3). # The name that we can dlopen(3).
dlname='libfontconfig.so.@major@.@minor@' dlname='@sharedlibfontconfig@'
# Names of this library. # Names of this library.
library_names='libfontconfig.so.@major@.@minor@' library_names='@sharedlibfontconfig@'
# The name of the static archive. # The name of the static archive.
old_library='libfontconfig.a' old_library='libfontconfig.a'