diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-08-24 10:45:00 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-08-24 10:45:00 +0000 |
| commit | 5c7e0d753c599931dc9536c0234a8fc5f21de007 (patch) | |
| tree | 49100883faa0af1b8f960bed18b8f614aa4a4dac | |
| parent | 7e4e3af8e164912094cc92ddf97d18c88853f394 (diff) | |
| download | pkgsrc-5c7e0d753c599931dc9536c0234a8fc5f21de007.tar.gz | |
More fixes for building ObjC code.
| -rw-r--r-- | fonts/fontforge/distinfo | 4 | ||||
| -rw-r--r-- | fonts/fontforge/patches/patch-fontforgeexe_Makefile.in | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo index 700e383dbd8..03752c5189e 100644 --- a/fonts/fontforge/distinfo +++ b/fonts/fontforge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.65 2017/05/04 19:23:18 adam Exp $ +$NetBSD: distinfo,v 1.66 2017/08/24 10:45:00 jperkin Exp $ SHA1 (fontforge-dist-20161004.tar.gz) = bafb76ccbfcb37f94cf71f32c79cc120d8102683 RMD160 (fontforge-dist-20161004.tar.gz) = fc3e3823bb06835b280109bd7928a3e092aec70d @@ -7,5 +7,5 @@ Size (fontforge-dist-20161004.tar.gz) = 20987883 bytes SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9 SHA1 (patch-configure) = d85d82bed7ee84c5b8282afd1310872eca39a3dd SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1 -SHA1 (patch-fontforgeexe_Makefile.in) = d44e00cd4aaa816ab0916a0bcd33f7b7a2bf8785 +SHA1 (patch-fontforgeexe_Makefile.in) = de7b58d1c84508f9aa843ea06d23a87b0502b344 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 cb3cc6a5f5b..a86aaf2134d 100644 --- a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in +++ b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-fontforgeexe_Makefile.in,v 1.1 2017/05/04 19:23:18 adam Exp $ +$NetBSD: patch-fontforgeexe_Makefile.in,v 1.2 2017/08/24 10:45:00 jperkin Exp $ Fix linking Objective-C code. ---- fontforgeexe/Makefile.in.orig 2017-05-04 17:59:40.000000000 +0000 +--- fontforgeexe/Makefile.in.orig 2016-10-04 12:30:31.000000000 +0000 +++ fontforgeexe/Makefile.in @@ -380,7 +380,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -13,3 +13,12 @@ Fix linking Objective-C code. $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \ $(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(bin_PROGRAMS) +@@ -2039,7 +2039,7 @@ fontforge-main.obj: main.c + $(AM_V_OBJC)$(LTOBJCCOMPILE) -c -o $@ $< + + libfontforgeexe_la-macobjective.lo: macobjective.m +- $(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) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m ++ $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=CC --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m + + mostlyclean-libtool: + -rm -f *.lo |