diff options
| author | Mihai Moldovan <ïonic@ionic.de> | 2016-11-05 05:18:06 +0000 |
|---|---|---|
| committer | Mihai Moldovan <ïonic@ionic.de> | 2016-11-05 05:25:18 +0000 |
| commit | c7e01938d80ec0ef94e59877a6f1d49545d6fef4 (patch) | |
| tree | 45ba5c34ff6ba3440ba466089a8f722272155b11 | |
| parent | e5091e0027c405674e0c87effc43576d085a054c (diff) | |
| download | nx-libs-c7e01938d80ec0ef94e59877a6f1d49545d6fef4.tar.gz nx-libs-c7e01938d80ec0ef94e59877a6f1d49545d6fef4.tar.bz2 nx-libs-c7e01938d80ec0ef94e59877a6f1d49545d6fef4.zip | |
nx-X11/lib/X11/Imakefile: essentially revert 5a90a63.
Creating libX11 symlinks breaks our builds in clean environments. Drop this
feature for now.
It must be rewritten to only create the symlinks after everything has been
built.
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 15097e716..5e3c06611 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -57,7 +57,21 @@ NX_DEFINES = -DNX_TRANS_SOCKET \ links exist. The make target libX11-links is at the end of the file. */ -EXTRALIBRARYDEPS = libX11-links +/* + Currently, this breaks our builds. Autoconf-based packages + like nxcompext try to detect host X11 libraries, but will + find links to libNX_X11 in exports/lib as libX11 files, + which in turn will be test-linked in configure and always + fail (for instance, because necessary dependencies like + libXcomp will not be available on clean systems.) + + Keep this disabled for now. + + If anything, this code needs to be reworked to create + libX11 symlinks only *after* everything has been + installed. +*/ +#EXTRALIBRARYDEPS = libX11-links #ifdef cygwinArchitecture NX_XCOMPLIBNAME = cygXcomp.dll @@ -1186,8 +1200,9 @@ libX11-links: done) /* remove libX11 _and_ libNX_X11 links in epxorts/lib */ -clean:: - @MAJREV=`echo $(SOXLIBREV) | cut -d. -f1`;\ - set -x; for i in "" .$$MAJREV .$(SOXLIBREV); do\ - $(RM) "$(BUILDLIBDIR)/lib$(LIBNAME).so$$i" "$(BUILDLIBDIR)/libX11.so$$i";\ - done +/* Disable this for now, refer to the comments regarding libX11-links. */ +#clean:: +# @MAJREV=`echo $(SOXLIBREV) | cut -d. -f1`;\ +# set -x; for i in "" .$$MAJREV .$(SOXLIBREV); do\ +# $(RM) "$(BUILDLIBDIR)/lib$(LIBNAME).so$$i" "$(BUILDLIBDIR)/libX11.so$$i";\ +# done |