summaryrefslogtreecommitdiffstats
path: root/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch')
-rw-r--r--source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch b/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch
new file mode 100644
index 000000000..0e94bb9e9
--- /dev/null
+++ b/source/ap/ghostscript/ef6bd6d61a3b5649dda077822d68de4e89133174.patch
@@ -0,0 +1,40 @@
+From ef6bd6d61a3b5649dda077822d68de4e89133174 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Wed, 30 Mar 2022 10:22:12 +0100
+Subject: [PATCH] Fix broken .so build
+
+The earlier rejig was incorrect.
+
+Noted here:
+
+https://github.com/ArtifexSoftware/ghostpdl/commit/9aae213ff3ae971942b427062799b009c07ea713#commitcomment-69841178
+---
+ base/unix-dll.mak | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/base/unix-dll.mak b/base/unix-dll.mak
+index 0e4bbab4a..89dfa5a2e 100644
+--- a/base/unix-dll.mak
++++ b/base/unix-dll.mak
+@@ -193,15 +193,16 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(NO_OP)
+
+ # Build the small Ghostscript loaders, with Gtk+ and without
+-$(GLOBJ)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
++$(GLO)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(GLCC) $(GLO_)dxmainc.$(OBJ) $(C_) $(PSSRC)dxmainc.c
+
+-$(GSSOC_XE): gs-so-links-subtarget $(GLOBJ)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
+- $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
++$(GLO)dxmain.$(OBJ): $(PSSRC)dxmain.c $(UNIX_DLL_MAK) $(MAKEDIRS)
++ $(GLCC) $(SOC_CFLAGS) $(GLO_)dxmain.$(OBJ) $(C_) $(PSSRC)dxmain.c
+
+-$(GLO_)$(SOC_LOADER).$(OBJ): $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
++$(GSSOC_XE): gs-so-links-subtarget $(GLO)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
++ $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
+
+-$(GSSOX_XE): gs-so-links-subtarget $(GLO_)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
++$(GSSOX_XE): gs-so-links-subtarget $(GLO)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS)
+
+ $(PCLSOC_XE): gpcl6-so-links-subtarget $(UNIX_DLL_MAK) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) $(MAKEDIRS)