Группа :: Науки/Наука о земле
Пакет: grass
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: grass-alt-build-with-external-lz4.patch
Скачать
Скачать
diff --git a/grass/include/Make/Compile.make b/grass/include/Make/Compile.make
index b1cf360..f2a0f8b 100644
--- a/grass/include/Make/Compile.make
+++ b/grass/include/Make/Compile.make
@@ -15,7 +15,7 @@ endif
endif
linker_base = $(PRELINK) && $(1) $(2) -o $@ $(filter %.o,$^) $(filter %.res,$^) $(3)
-linker_x = $(call linker_base,$(1),$(LDFLAGS),$(FMODE_OBJ) $(MANIFEST_OBJ) $(LIBES) $(EXTRA_LDFLAGS) $(EXTRA_LIBS) $(MATHLIB))
+linker_x = $(call linker_base,$(1),$(LDFLAGS),$(FMODE_OBJ) $(MANIFEST_OBJ) $(LIBES) $(EXTRA_LDFLAGS) $(EXTRA_LIBS) $(MATHLIB) -llz4)
linker_c = $(call linker_x,$(CC))
linker_cxx = $(call linker_x,$(CXX))
linker = $(call linker_x,$(LINK))
diff --git a/grass/include/Make/Shlib.make b/grass/include/Make/Shlib.make
index 8b30756..6aae76a 100644
--- a/grass/include/Make/Shlib.make
+++ b/grass/include/Make/Shlib.make
@@ -7,7 +7,7 @@ CXXFLAGS += $(SHLIB_CFLAGS)
LDFLAGS += $(SHLIB_LDFLAGS)
$(SHLIB): $(SHLIB_OBJS)
- $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
+ $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB) -llz4
ifndef MINGW
(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_LIB_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
endif