mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-29 16:37:30 -07:00
8b89ef5368
according to MAVEN_ID and SRC_URI
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: 1291545e8f
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
29 lines
832 B
Diff
29 lines
832 B
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -124,11 +124,7 @@
|
|
$(CXX) $(CXXFLAGS) -c $< -o $@
|
|
|
|
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
|
|
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
|
|
- # Workaround for strip Protocol error when using VirtualBox on Mac
|
|
- cp $@ /tmp/$(@F)
|
|
- $(STRIP) /tmp/$(@F)
|
|
- cp /tmp/$(@F) $@
|
|
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle $(LDFLAGS)
|
|
|
|
clean-native:
|
|
rm -rf $(SNAPPY_OUT)
|
|
--- a/Makefile.common
|
|
+++ b/Makefile.common
|
|
@@ -274,8 +274,8 @@
|
|
|
|
CXX := $($(os_arch)_CXX)
|
|
STRIP := $($(os_arch)_STRIP)
|
|
-CXXFLAGS := $($(os_arch)_CXXFLAGS)
|
|
-LINKFLAGS := $($(os_arch)_LINKFLAGS)
|
|
+CXXFLAGS := $($(os_arch)_CXXFLAGS) $(CXXFLAGS)
|
|
+LINKFLAGS := $($(os_arch)_LINKFLAGS) $(LDFLAGS)
|
|
LIBNAME := $($(os_arch)_LIBNAME)
|
|
SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS)
|
|
|