mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-23 06:28:12 -07:00
77bf00d28f
Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
Closes: 1c957771ab
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
27 lines
1006 B
Diff
27 lines
1006 B
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -36,11 +36,11 @@
|
|
|
|
$(SNAPPY_OUT)/%.o: $(BITSHUFFLE_SRC_DIR)/%.c
|
|
@mkdir -p $(@D)
|
|
- $(CXX) $(CXXFLAGS) $(CXXFLAGS_BITSHUFFLE) -c $< -o $@
|
|
+ $(CXX) $(CXXFLAGS) -c $< -o $@
|
|
|
|
-SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) $(patsubst %.c,%.o,$(BITSHUFFLE_C)) SnappyNative.o BitShuffleNative.o)
|
|
+SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o BitShuffleNative.o)
|
|
|
|
-CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT) -I$(BITSHUFFLE_SRC_DIR)
|
|
+CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT)
|
|
|
|
ifndef CXXFLAGS_BITSHUFFLE
|
|
ifeq ($(OS_NAME)-$(OS_ARCH),Linux-x86_64)
|
|
@@ -124,7 +124,7 @@
|
|
$(CXX) $(CXXFLAGS) -c $< -o $@
|
|
|
|
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
|
|
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
|
|
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
|
|
# Workaround for strip Protocol error when using VirtualBox on Mac
|
|
cp $@ /tmp/$(@F)
|
|
$(STRIP) /tmp/$(@F)
|