summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-09-04 21:13:22 +0000
committerjperkin <jperkin@pkgsrc.org>2017-09-04 21:13:22 +0000
commit7140dab07a6ea23aa4b61683f5edc45ee1929e12 (patch)
tree84b24b332a4f4178f25c0248d3447d5e6ace7671
parente3827b0b68fc19e64f43d8abc742157ef0069bb5 (diff)
downloadpkgsrc-7140dab07a6ea23aa4b61683f5edc45ee1929e12.tar.gz
Fix building ObjC code again.
-rw-r--r--fonts/fontforge/distinfo4
-rw-r--r--fonts/fontforge/patches/patch-fontforgeexe_Makefile.in11
2 files changed, 12 insertions, 3 deletions
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 16951e12273..d6c895edce4 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2017/08/25 09:20:38 adam Exp $
+$NetBSD: distinfo,v 1.68 2017/09/04 21:13:22 jperkin Exp $
SHA1 (fontforge-dist-20170731.tar.xz) = 89ab434e523dbea8fd9f81907dda33f023055b05
RMD160 (fontforge-dist-20170731.tar.xz) = af473f403999937dd95715bdfd98f582d05c94cd
@@ -7,5 +7,5 @@ Size (fontforge-dist-20170731.tar.xz) = 13985256 bytes
SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9
SHA1 (patch-configure) = 23c953855960f65c539d9ccd15df14fb6a9a2428
SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1
-SHA1 (patch-fontforgeexe_Makefile.in) = cfacd2b76e98593e8d0867eddd9f84ee1bd24f26
+SHA1 (patch-fontforgeexe_Makefile.in) = 725a0a033132bf859917e8f28c5d0cbbad3eea0e
SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b
diff --git a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
index c864d79ba25..2d6ba6c2f5d 100644
--- a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
+++ b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-fontforgeexe_Makefile.in,v 1.3 2017/08/25 09:20:38 adam Exp $
+$NetBSD: patch-fontforgeexe_Makefile.in,v 1.4 2017/09/04 21:13:22 jperkin Exp $
Fix linking Objective-C code.
@@ -13,3 +13,12 @@ Fix linking Objective-C code.
$(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \
$(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(bin_PROGRAMS)
+@@ -2501,7 +2501,7 @@ fontforge-main.obj: main.c
+ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $<
+
+ libfontforgeexe_la-macobjective.lo: macobjective.m
+-@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -MT libfontforgeexe_la-macobjective.lo -MD -MP -MF $(DEPDIR)/libfontforgeexe_la-macobjective.Tpo -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
++@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile --tag=CC $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -MT libfontforgeexe_la-macobjective.lo -MD -MP -MF $(DEPDIR)/libfontforgeexe_la-macobjective.Tpo -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
+ @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfontforgeexe_la-macobjective.Tpo $(DEPDIR)/libfontforgeexe_la-macobjective.Plo
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='macobjective.m' object='libfontforgeexe_la-macobjective.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@