pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
unifi6: Honor LDFLAGS for RELRO, from net/unifi
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Sat Aug 14 11:17:01 2021 -0400
Changeset: 24b486ee287c0fc10c6a5f099151abc826353205
Modified Files:
unifi6/distinfo
unifi6/patches/patch-snappy-java-1.0.5.4_Makefile
unifi6/patches/patch-snappy-java-1.0.5.4_Makefile.common
Log Message:
unifi6: Honor LDFLAGS for RELRO, from net/unifi
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=24b486ee287c0fc10c6a5f099151abc826353205
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
unifi6/distinfo | 2 +-
unifi6/patches/patch-snappy-java-1.0.5.4_Makefile | 11 ++++++++++-
unifi6/patches/patch-snappy-java-1.0.5.4_Makefile.common | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diffs:
diff --git a/unifi6/distinfo b/unifi6/distinfo
index e5e990fffd..57c57ed1cc 100644
--- a/unifi6/distinfo
+++ b/unifi6/distinfo
@@ -12,5 +12,5 @@ SHA1 (unifi-6.2.26.zip) = 097391c5b407da490e52b6e991eacf5fd26f90f8
RMD160 (unifi-6.2.26.zip) = 8b790e420602f1e8b65528c64c4d331ea4d940e6
SHA512 (unifi-6.2.26.zip) = fccffca9bcb31a1da2c389e83ea9a48e4cde6d958368d4d623d459bae095b57a4d7946086b0ac0e4dff5c4c565961ed2c11f7bc2dfbf8b5c6d590fb32af351e8
Size (unifi-6.2.26.zip) = 152767218 bytes
-SHA1 (patch-snappy-java-1.0.5.4_Makefile) = 10926cfb45ac67b04d9d4fba3eae1aa760a40ef4
+SHA1 (patch-snappy-java-1.0.5.4_Makefile) = 86a4ab3075cef0ac6475dee253efa98a91915b12
SHA1 (patch-snappy-java-1.0.5.4_Makefile.common) = d574d053351d2fcd55b7846f4de0fe3fa77e821e
diff --git a/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile b/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile
index 0e6fd9db74..30f458a996 100644
--- a/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile
+++ b/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-snappy-java-1.0.5.4_Makefile,v 1.1 2021/08/13 17:25:06 wiz Exp $
It tries to download a distfile with curl. We manage this manually.
@@ -17,3 +17,12 @@ Honor LDFLAGS.
jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
+@@ -50,7 +48,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/or
+
+
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
++ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) $(LDFLAGS)
+ $(STRIP) $@
+
+ clean-native:
diff --git a/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile.common b/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile.common
index 17e403ea00..f6b34d860d 100644
--- a/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile.common
+++ b/unifi6/patches/patch-snappy-java-1.0.5.4_Makefile.common
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-snappy-java-1.0.5.4_Makefile.common,v 1.1 2021/08/13 17:25:06 wiz Exp $
Don't produce a broken shared library.
Home |
Main Index |
Thread Index |
Old Index