diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-25 15:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-25 15:03:52 +0100 |
| commit | a653aed4c0f0c83185fca8076559ae10553ec11f (patch) | |
| tree | dc732ad657d21942d1d964763ab301a2672299f3 | |
| parent | dd1ae1769858b7467bd4cde2b83b1cda8653c983 (diff) | |
| parent | 06c14b83184f30498e27fed435d38d6e33338f2c (diff) | |
| download | nx-libs-a653aed4c0f0c83185fca8076559ae10553ec11f.tar.gz nx-libs-a653aed4c0f0c83185fca8076559ae10553ec11f.tar.bz2 nx-libs-a653aed4c0f0c83185fca8076559ae10553ec11f.zip | |
Merge branch 'Ionic-bugfix/FTBFS-non-ELF' into 3.6.x
Attributes GH PR #663: https://github.com/ArcticaProject/nx-libs/pull/663
| -rw-r--r-- | m4/nx-macros.m4 | 17 | ||||
| -rw-r--r-- | nxcompshad/configure.ac | 2 | ||||
| -rw-r--r-- | nxcompshad/src/Makefile.am | 6 | ||||
| -rw-r--r-- | nxproxy/configure.ac | 2 | ||||
| -rw-r--r-- | nxproxy/src/Makefile.am | 5 |
5 files changed, 31 insertions, 1 deletions
diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4 index 1c0e1ea7a..81d6ea147 100644 --- a/m4/nx-macros.m4 +++ b/m4/nx-macros.m4 @@ -407,6 +407,23 @@ FreeBSD= test "$nxconf_cv_freebsd" = yes && FreeBSD=yes ]) # NX_BUILD_ON_FreeBSD +# Check to see if we're generating binaries in ELF format. + +AC_DEFUN([NX_TARGET_USE_ELF], +[AC_CACHE_CHECK([if target system is ELF-based], [nxconf_cv_targetelf], +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[ +#ifndef __ELF__ +#error not an ELF-based system +error! +#endif +]], +[[ +]])], +[nxconf_cv_targetelf=yes], [nxconf_cv_targetelf=no])]) +AM_CONDITIONAL([TARGET_ELF], [test x"$nxconf_cv_targetelf" = "xyes"]) +]) # NX_TARGET_USE_ELF + AC_DEFUN([LIBJPEG_FALLBACK_CHECK],[ AC_MSG_CHECKING([for libjpeg shared libary file and headers]) AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac index 932fb45a8..f493bdf0e 100644 --- a/nxcompshad/configure.ac +++ b/nxcompshad/configure.ac @@ -47,6 +47,8 @@ AC_LANG([C++]) NX_COMPILER_BRAND NX_DEFAULT_OPTIONS +NX_TARGET_USE_ELF + AC_ARG_ENABLE([cxx11], [AS_HELP_STRING([--enable-cxx11], [enable optional features requiring C++11 support (disabled by default)])], diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am index f7beac86e..4580149ad 100644 --- a/nxcompshad/src/Makefile.am +++ b/nxcompshad/src/Makefile.am @@ -39,10 +39,14 @@ AM_CPPFLAGS = \ libXcompshad_la_LDFLAGS = \ -version-number @LT_COMPSHAD_VERSION@ -no-undefined \ - -Wl,--enable-new-dtags \ -R '$(libdir)/nx/X11' \ $(NULL) +if TARGET_ELF +libXcompshad_la_LDFLAGS += \ + -Wl,--enable-new-dtags \ +endif TARGET_ELF + libXcompshadincludedir = $(includedir)/nx libXcompshadinclude_HEADERS = \ $(top_srcdir)/include/Shadow.h \ diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac index a1dcab442..6a0a41cbb 100644 --- a/nxproxy/configure.ac +++ b/nxproxy/configure.ac @@ -26,6 +26,8 @@ AC_LANG([C]) NX_COMPILER_BRAND NX_DEFAULT_OPTIONS +NX_TARGET_USE_ELF + dnl This is a workaround for a nasty libtool bug. dnl We actually compile libXcomp with pthread support, but libtool uses g++ ... -nostdlib ... -pthread dnl on Linux. -nostdlib causes -pthread to be ignored. diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am index ecf2a0486..fbe52cbf8 100644 --- a/nxproxy/src/Makefile.am +++ b/nxproxy/src/Makefile.am @@ -15,8 +15,13 @@ nxproxy_LDADD = \ nxproxy_LDFLAGS = \ $(PTHREAD_LDFLAGS) \ + $(NULL) + +if TARGET_ELF +nxproxy_LDFLAGS += \ -Wl,--enable-new-dtags \ $(NULL) +endif TARGET_ELF nxproxy_CFLAGS = \ $(BASE_CFLAGS) \ |