From f31f3e78b4205e0c446e842ff80d0c1e52e1c3a9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 24 Jan 2023 15:21:27 -0500 Subject: [PATCH] Link tstcodec85 against libjbig85 This also fixes an unintentional race condition in the build. --- jbigkit-2.1-shlib.patch | 2 +- jbigkit-ldflags.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jbigkit-2.1-shlib.patch b/jbigkit-2.1-shlib.patch index bf5b22a..2d115c0 100644 --- a/jbigkit-2.1-shlib.patch +++ b/jbigkit-2.1-shlib.patch @@ -20,7 +20,7 @@ diff -Naur jbigkit-2.1.old/libjbig/Makefile jbigkit-2.1/libjbig/Makefile -tstcodec85: tstcodec85.o jbig85.o jbig_ar.o - $(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o +tstcodec85: tstcodec85.o libjbig85.so -+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig ++ $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85 -libjbig.a: jbig.o jbig_ar.o - rm -f libjbig.a diff --git a/jbigkit-ldflags.patch b/jbigkit-ldflags.patch index e527cb9..3d24f69 100644 --- a/jbigkit-ldflags.patch +++ b/jbigkit-ldflags.patch @@ -9,8 +9,8 @@ diff -up jbigkit-2.1/libjbig/Makefile.ldflags jbigkit-2.1/libjbig/Makefile + $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig $(LDFLAGS) tstcodec85: tstcodec85.o libjbig85.so -- $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig -+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig $(LDFLAGS) +- $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85 ++ $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85 $(LDFLAGS) %.so: %.so.$(VERSION) ln -sf $< $@