diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2019-10-08 07:25:27 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2019-10-08 07:25:27 +0200 |
| commit | 6d050e13e9dbbeffdb45fc1c5b977b996d310981 (patch) | |
| tree | b201bc97ea832ce0c43f144ef7229f52e42bbf23 /debian/patches/0005-hardening.patch | |
| parent | 10ce63378912ef63c8882889f02ed4dff0416f32 (diff) | |
| parent | d84f449fcb5ea05fcbb9eee098b7438aa332ad31 (diff) | |
Merge branch 'release/debian/0.30.7-1'debian/0.30.7-1
Diffstat (limited to 'debian/patches/0005-hardening.patch')
| -rw-r--r-- | debian/patches/0005-hardening.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/0005-hardening.patch b/debian/patches/0005-hardening.patch deleted file mode 100644 index c8abeea..0000000 --- a/debian/patches/0005-hardening.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: pass compiler flags set in debian/rules to compiler -Author: Devid Antonio Filoni <d.filoni@ubuntu.com> - -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -35,7 +35,7 @@ CORE_SUPPORTED_LANGUAGES=$(shell cat po/ - LOCAL_LANG_DIR=locale-langpack - SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale - --VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS) -+VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --enable-experimental --enable-deprecated $(USER_VALAFLAGS) - ifdef UNITY_SUPPORT - VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT - endif -@@ -661,7 +661,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) - @ - - $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile -- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $< -+ $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $< - - $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled $(DOC_LANG_STAMP) - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@ -Index: trunk/plugins/Makefile.plugin.mk -=================================================================== ---- trunk.orig/plugins/Makefile.plugin.mk -+++ trunk/plugins/Makefile.plugin.mk -@@ -42,7 +42,7 @@ PLUGIN_EXTRAFLAGS ?= --vapidir=../common - PLUGIN_EXTRALINKFLAGS ?= -L../common/ -lshotwell-plugin-common - - .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES) -- $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --ccode --enable-deprecated \ -+ $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --ccode --enable-deprecated \ - --vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \ - $(USER_VALAFLAGS) \ - $(PLUGIN_EXTRAFLAGS) \ |