ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update buildsys and use rpath for ObjFW

Browse source 
FossilOrigin-Name: 86da8ecd4c06417d69003c8e4a4650ca41fec3de8c0d887824fc512529c0288b
This commit is contained in:
Jonathan Schleifer 2020-10-03 09:58:12 +00:00
parent c87e963d82
commit 49b20773c3
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build-aux/m4/buildsys.m4
View file

@ -309,6 +309,7 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
AC_SUBST(FRAMEWORK_LDFLAGS) AC_SUBST(FRAMEWORK_LDFLAGS)
AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME) AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
AC_SUBST(FRAMEWORK_LIBS)
$1 $1
;; ;;

3
buildsys.mk.in
View file

@ -63,6 +63,7 @@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@ FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@
FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@ FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@
FRAMEWORK_LIBS = @FRAMEWORK_LIBS@
CODESIGN = @CODESIGN@ CODESIGN = @CODESIGN@
CODESIGN_IDENTITY ?= - CODESIGN_IDENTITY ?= -
CLEAN_LIB = @CLEAN_LIB@ CLEAN_LIB = @CLEAN_LIB@
@ -191,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
out="$@"; \ out="$@"; \
if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \ if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
rm -fr $$out; false; \ rm -fr $$out; false; \

8
configure.ac
View file

@ -26,8 +26,8 @@ CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)" CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)" OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)" LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)"
AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)") FRAMEWORK_LIBS="$($OBJFW_CONFIG --framework-libs)"
AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)") LIBS="$($OBJFW_CONFIG --libs --rpath)"
AX_CHECK_COMPILER_FLAGS(-Wdocumentation, AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"]) [OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])
@ -55,12 +55,14 @@ AS_IF([test x"$with_openssl" != x"no" -a x"$with_openssl" != x""], [
OPENSSL_CPPFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include" OPENSSL_CPPFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
OPENSSL_LIBS="$OPENSSL_LIBS -L$with_openssl/lib" OPENSSL_LIBS="$OPENSSL_LIBS -L$with_openssl/lib"
CPPFLAGS="$CPPFLAGS -I$with_openssl/include" CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
LIBS="$LIBS -L$with_openssl/lib" LIBS="-L$with_openssl/lib $LIBS"
FRAMEWORK_LIBS="-L$with_openssl/lib $FRAMEWORK_LIBS"
]) ])
AC_CHECK_LIB(ssl, main, [ AC_CHECK_LIB(ssl, main, [
OPENSSL_LIBS="$OPENSSL_LIBS -lssl -lcrypto" OPENSSL_LIBS="$OPENSSL_LIBS -lssl -lcrypto"
LIBS="$LIBS -lssl -lcrypto" LIBS="$LIBS -lssl -lcrypto"
FRAMEWORK_LIBS="$FRAMEWORK_LIBS -lssl -lcrypto"
], [ ], [
AC_MSG_ERROR(You need openssl >= 1.0.2 installed!) AC_MSG_ERROR(You need openssl >= 1.0.2 installed!)
], [-lcrypto]) ], [-lcrypto])

2
extra.mk.in
View file

@ -3,5 +3,3 @@ OBJOPENSSL_STATIC_LIB = @OBJOPENSSL_STATIC_LIB@
OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@ OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@
OBJFW_CONFIG = @OBJFW_CONFIG@ OBJFW_CONFIG = @OBJFW_CONFIG@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@

2
src/Makefile
View file

@ -17,5 +17,3 @@ INCLUDES = ${SRCS:.m=.h} \
include ../buildsys.mk include ../buildsys.mk
LD = ${OBJC} LD = ${OBJC}
FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
LIBS := ${OBJFW_LIBS} ${LIBS}