summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-06-30 04:12:16 +0000
committertnn <tnn@pkgsrc.org>2015-06-30 04:12:16 +0000
commit16809e12e4631a10348441bd4fdeea4eb5fa67d8 (patch)
tree35095b0db27b7856d5aab0da5b03bf692cce395d /x11
parentf2368df88598ced876440d2af89f8094a1a41c11 (diff)
downloadpkgsrc-16809e12e4631a10348441bd4fdeea4eb5fa67d8.tar.gz
fix build of assembly files on ARM
Diffstat (limited to 'x11')
-rw-r--r--x11/pixman/distinfo3
-rw-r--r--x11/pixman/patches/patch-pixman_Makefile.in21
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 7a3be388221..3fdc69e517d 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2015/01/23 15:10:51 joerg Exp $
+$NetBSD: distinfo,v 1.55 2015/06/30 04:12:16 tnn Exp $
SHA1 (pixman-0.32.6.tar.bz2) = 5b730399e1e212e5acaa69a4f1a2c7be1af1cdc4
RMD160 (pixman-0.32.6.tar.bz2) = d3bd5fef800499215944606c750696325853de2c
@@ -7,4 +7,5 @@ SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
SHA1 (patch-bb) = d47b1857771b8addb6897d45782ba2735a7aacbd
SHA1 (patch-bc) = 3e23e6c482ea193885f3f762af355ef2f692132b
SHA1 (patch-bd) = 1b1432f4a88d5486afdb4c0cad0808d3748fa522
+SHA1 (patch-pixman_Makefile.in) = 7dabdc0e2c8c73780c4b005ef6f5055a550b9651
SHA1 (patch-pixman_pixman-mmx.c) = 9ddd1bd5a691b8e86a81539fbe518c9b3a3a25ff
diff --git a/x11/pixman/patches/patch-pixman_Makefile.in b/x11/pixman/patches/patch-pixman_Makefile.in
new file mode 100644
index 00000000000..117c879a458
--- /dev/null
+++ b/x11/pixman/patches/patch-pixman_Makefile.in
@@ -0,0 +1,21 @@
+$NetBSD: patch-pixman_Makefile.in,v 1.1 2015/06/30 04:12:16 tnn Exp $
+
+Fix build of .S files with libtool on ARM.
+libtool refuses to use "--mode=compile gcc" without "--tag=CC".
+
+ CPPAS pixman-arm-simd-asm.lo
+libtool: compile: unable to infer tagged configuration
+libtool: compile: specify a tag with `--tag'
+*** Error code 1
+
+--- pixman/Makefile.in.orig 2014-07-05 22:54:03.000000000 +0000
++++ pixman/Makefile.in
+@@ -289,7 +289,7 @@ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+ CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
+-LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
++LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CCASFLAGS) $(CCASFLAGS)