ObjFW  Check-in [3392826e13]

Overview
Comment:Update buildsys
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 3392826e13c4b3e3e4932979785fc3aa9c5a99e86fabb4b8fb9ba67f6d65aba9
User & Date: js on 2018-01-21 21:47:08
Other Links: manifest | tags
Context
2018-01-21
22:16
Allow building the runtime as a .framework check-in: 0f42b0eafd user: js tags: trunk
21:47
Update buildsys check-in: 3392826e13 user: js tags: trunk
21:38
objfw-config: Add --framework-libs check-in: 5fa3902ef9 user: js tags: trunk
Changes

Modified build-aux/m4/buildsys.m4 from [9e4857b7b5] to [037e222758].

140
141
142
143
144
145
146

147
148
149
150
151
152
153
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154







+







	AC_SUBST(PROG_IMPLIB_NEEDED)
	AC_SUBST(PROG_IMPLIB_LDFLAGS)
])

AC_DEFUN([BUILDSYS_SHARED_LIB], [
	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_MSG_CHECKING(for shared library system)

	case "$host_os" in
		darwin*)
			AC_MSG_RESULT(Darwin)
			LIB_CFLAGS='-fPIC -DPIC'
			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
			LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
			LIB_PREFIX='lib'
279
280
281
282
283
284
285
286
287
288
289
280
281
282
283
284
285
286

287
288
289







-



				FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
			])

			AC_SUBST(FRAMEWORK_LDFLAGS)
			AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)

			$1

			;;
	esac
])

Modified buildsys.mk.in from [22fedc8558] to [92feb15db4].

273
274
275
276
277
278
279
280

281
282
283
284
285
286
287
273
274
275
276
277
278
279

280
281
282
283
284
285
286
287







-
+







			${INSTALL_OK}; \
		else \
			${INSTALL_FAILED}; \
		fi \
	fi
	${LINK_STATUS}
	out="$@"; \
	if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \
	if ${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 \
		${LINK_OK}; \
	else \
		rm -fr $$out; \
		${LINK_FAILED}; \
	fi

${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}

Modified src/Makefile from [58756ea4bf] to [fddf9b0f91].

203
204
205
206
207
208
209

203
204
205
206
207
208
209
210







+

include ../buildsys.mk

CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
LD = ${OBJC}
LDFLAGS += ${REEXPORT_RUNTIME}
LIBS += -Lruntime ${RUNTIME_LIBS}
FRAMEWORK_LIBS += -Lruntime ${RUNTIME_LIBS}

Modified src/bridge/Makefile from [d05c31c835] to [757b50f013].

28
29
30
31
32
33
34
35

36
37

28
29
30
31
32
33
34

35


36







-
+
-
-
+

includesubdir = ObjFW_Bridge

include ../../buildsys.mk

CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES
LD = ${OBJC}
LIBS = -framework Foundation
LIBS += -framework Foundation -L.. -lobjfw
LIB_LDFLAGS += -L.. -lobjfw
FRAMEWORK_LDFLAGS += -F.. -framework ObjFW
FRAMEWORK_LIBS += -framework Foundation -F.. -framework ObjFW