diff options
| author | joerg <joerg> | 2015-01-06 22:57:57 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-01-06 22:57:57 +0000 |
| commit | 5d4d2d8bf2a64e125e6fb5d993208843df495c97 (patch) | |
| tree | dc386987bf4a292087b28f13f52a430a128ed1ee /archivers | |
| parent | 025e9093a42a06cdef07a205a34a031351fb2daa (diff) | |
| download | pkgsrc-5d4d2d8bf2a64e125e6fb5d993208843df495c97.tar.gz | |
Shuffle flags around to make sure that the system liblzma is not picked
up first.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/xz/distinfo | 3 | ||||
| -rw-r--r-- | archivers/xz/patches/patch-src_xz_Makefile.in | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/archivers/xz/distinfo b/archivers/xz/distinfo index 448b296427c..b73e401cc9b 100644 --- a/archivers/xz/distinfo +++ b/archivers/xz/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2014/12/30 06:37:35 adam Exp $ +$NetBSD: distinfo,v 1.13 2015/01/06 22:57:57 joerg Exp $ SHA1 (xz-5.2.0.tar.bz2) = 0e5d2098cf73a071ec76c091bb598de12d77b4cf RMD160 (xz-5.2.0.tar.bz2) = 12325e2390b7397abe4665e964e8c416b4640b5b Size (xz-5.2.0.tar.bz2) = 1184673 bytes +SHA1 (patch-src_xz_Makefile.in) = 3f76a5930228cee24bc0e53425fd8c930c90334d diff --git a/archivers/xz/patches/patch-src_xz_Makefile.in b/archivers/xz/patches/patch-src_xz_Makefile.in new file mode 100644 index 00000000000..bc3c67c5289 --- /dev/null +++ b/archivers/xz/patches/patch-src_xz_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-src_xz_Makefile.in,v 1.1 2015/01/06 22:57:58 joerg Exp $ + +--- src/xz/Makefile.in.orig 2015-01-06 21:53:59.000000000 +0000 ++++ src/xz/Makefile.in +@@ -163,7 +163,7 @@ am__v_CC_1 = + CCLD = $(CC) + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; +@@ -478,7 +478,7 @@ clean-binPROGRAMS: + + xz$(EXEEXT): $(xz_OBJECTS) $(xz_DEPENDENCIES) $(EXTRA_xz_DEPENDENCIES) + @rm -f xz$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(xz_OBJECTS) $(xz_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(xz_OBJECTS) $(xz_LDADD) $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) |