ObjFW  Check-in [5a98cf8a50]

Overview
Comment:Update buildsys
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5a98cf8a50df475fa50787ca954243ab44bf4617cfafffbc8b65731424d091d7
User & Date: js on 2018-01-21 19:01:13
Other Links: manifest | tags
Context
2018-01-21
21:38
objfw-config: Add --framework-libs check-in: 5fa3902ef9 user: js tags: trunk
19:01
Update buildsys check-in: 5a98cf8a50 user: js tags: trunk
16:03
Fix compiling as ObjC++ check-in: 98caf8e26c user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified build-aux/m4/buildsys.m4 from [54420c9822] to [9e4857b7b5]. 

1
2
3



4
5
6
7
8
9
10

1


2
3
4
5
6
7
8
9
10
11


-
-
+
+
+








dnl
dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017
dnl Jonathan Schleifer <js@heap.zone>
dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017,
dnl               2018
dnl   Jonathan Schleifer <js@heap.zone>
dnl
dnl https://heap.zone/git/?p=buildsys.git
dnl
dnl Permission to use, copy, modify, and/or distribute this software for any
dnl purpose with or without fee is hereby granted, provided that the above
dnl copyright notice and this permission notice is present in all copies.
dnl
︙
276
277
278
279
280
281
282



283
284
285

277
278
279
280
281
282
283
284
285
286
287
288
289








+
+
+




				AC_MSG_RESULT(no)
				FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
				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 [e84a6fb17d] to [22fedc8558]. 

1
2
3
4


5
6
7
8
9
10
11

1
2


3
4
5
6
7
8
9
10
11



-
-
+
+








#
#  Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
#  2017
#  Jonathan Schleifer <js@heap.zone>
#                2017, 2018
#    Jonathan Schleifer <js@heap.zone>
#
#  https://heap.zone/git/?p=buildsys.git
#
#  Permission to use, copy, modify, and/or distribute this software for any
#  purpose with or without fee is hereby granted, provided that the above
#  copyright notice and this permission notice is present in all copies.
#
︙

Modified configure.ac from [a1b18751bf] to [51b7eeb39e].

︙
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253

254
255

256
257

258
259
260
261
262
263
264

235
236
237
238
239
240
241

242
243
244
245
246
247
248
249
250
251

252


253


254
255
256
257
258
259
260
261








-










-
+
-
-
+
-
-
+









AC_CHECK_TOOL(AR, ar)
AC_PROG_RANLIB
AC_ARG_ENABLE(shared,
	AS_HELP_STRING([--disable-shared], [do not build shared library]))
AS_IF([test x"$enable_shared" != x"no"], [
	BUILDSYS_SHARED_LIB
	BUILDSYS_FRAMEWORK
	AC_SUBST(OBJFW_SHARED_LIB, "${LIB_PREFIX}objfw${LIB_SUFFIX}")
	AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
	AC_SUBST(EXCEPTIONS_EXCEPTIONS_LIB_A, "exceptions/exceptions.lib.a")
	AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a")
	AC_SUBST(FORWARDING_FORWARDING_LIB_A, "forwarding/forwarding.lib.a")
	AC_SUBST(INVOCATION_LIB_A, "invocation.lib.a")
	AC_SUBST(INVOCATION_INVOCATION_LIB_A, "invocation/invocation.lib.a")
	AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a")
	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_LIB_A, "lookup-asm/lookup-asm.lib.a")

	case "$host_os" in
	BUILDSYS_FRAMEWORK([
		darwin*)
			AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
			;;
	esac
	])
], [
	AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
	AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
])
AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
	AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a")
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.03s