diff options
| author | Raul Infante-Sainz <infantesainz@gmail.com> | 2020-01-13 15:06:39 +0000 |
|---|---|---|
| committer | Raul Infante-Sainz <infantesainz@gmail.com> | 2020-01-13 15:06:39 +0000 |
| commit | 4c05dde2b3e1a6ee98e53430a0ce39a8b28750a6 (patch) | |
| tree | dbe807242e657376324d7cb112366e751507f180 | |
| parent | f73e63f7964c21feac9f7965f8ac8749f8367539 (diff) | |
Adding X11 libraries path to LDFLAGS in Ghostscript installation
Until this commit, the checking of X11 installation done to ensure that
it is already available in the host system was crashing in macOS
systems. The reason is that the place of the X11 libraries use to be
`/opt/X11/lib' in macOS systems. With this commit, this issue has been
fixed by adding this directory to the LDFLAGS.
| -rw-r--r-- | .file-metadata | bin | 7763 -> 7763 bytes | |||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 5 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex a684d71..88b40d7 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 2b9b13f..f46480a 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -888,6 +888,8 @@ $(ibidir)/ghostscript: $(ibidir)/libpng \ # First we need to make sure some necessary X11 libraries that we # don't yet install in this template are present on the host # system, see https://savannah.nongnu.org/task/?15481 . + # Adding `-L/opt/X11/lib' to LDFLAGS is necessary for macOS systems + # because X11 libraries used to be installed there. echo; echo "Template: testing necessary X11 libraries for ghostscript" echo "---------------------------------------------------------" @@ -895,7 +897,8 @@ $(ibidir)/ghostscript: $(ibidir)/libpng \ cprog=$(ddir)/libXext-test-for-ghostscript.c echo "#include <stdio.h>" > $$cprog echo "int main(void) {return 0;}" >> $$cprog - if $$CC $$cprog -o$$oprog -lXt -lSM -lICE -lXext; then + export LDFLAGS="$$LDFLAGS -L/opt/X11/lib" + if $$CC $$LDFLAGS $$cprog -o$$oprog -lXt -lSM -lICE -lXext; then echo "Necessary X11 libraries are present. Proceeding to the build." rm $$cprog $$oprog else |