| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Thu, 28 Apr 2016 14:40:42 -0700 | |
| changeset 5891 | 196a7310cc4d |
| child 7661 | aff9737ef6ba |
| permissions | -rw-r--r-- |
|
5891
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
1 |
This fixes configure tests that mistakenly omit the -shared flag when |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
2 |
testing whether -znodelete can be used. |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
4 |
Need to file upstream bug |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
--- glib-2.44.0/configure.ac 2015-04-19 19:15:34.588825144 -0700 |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
+++ glib-2.44.0/configure.ac 2015-04-19 19:18:29.068222772 -0700 |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
@@ -3467,8 +3467,9 @@ |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
AC_ARG_ENABLE([znodelete], |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
[AS_HELP_STRING([--disable-znodelete], |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
11 |
[avoid linking with -z,nodelete])],, |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
12 |
- [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
+ [SAVED_CFLAGS="${CFLAGS}" SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
AC_MSG_CHECKING([for --fatal-warnings linker flag]) |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
15 |
+ CFLAGS="${SAVED_CFLAGS} -shared"
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
16 |
LDFLAGS=-Wl,--fatal-warnings |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
LIBS= |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
18 |
AC_TRY_LINK([], [return 0], |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
19 |
@@ -3483,7 +3484,7 @@ |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
enable_znodelete=yes, |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
AC_MSG_RESULT(no) |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
enable_znodelete=no) |
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
- LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
+ CFLAGS="${SAVED_CFLAGS}" LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
26 |
if test "x${enable_znodelete}" = "xyes"; then
|
|
196a7310cc4d
23169139 Move glib to Userland and update to 2.46.0
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
27 |
GOBJECT_LINK_FLAGS=-Wl,-z,nodelete |