From 0338ff21546525291dc6d874167f24f1272eef29 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Wed, 19 Nov 2014 17:26:39 -0500 Subject: [PATCH] remove now unneeded patches --- ...ly-used-for-jemalloc-rename-all-uses.patch | 229 ------------------ ...ass-CFG_GCCISH_CFLAGS-inside-CC-inst.patch | 36 --- 2 files changed, 265 deletions(-) delete mode 100644 recipes/rust/files/0005-CFG_CFLAGS-is-only-used-for-jemalloc-rename-all-uses.patch delete mode 100644 recipes/rust/files/0006-mk-rt-jemalloc-pass-CFG_GCCISH_CFLAGS-inside-CC-inst.patch diff --git a/recipes/rust/files/0005-CFG_CFLAGS-is-only-used-for-jemalloc-rename-all-uses.patch b/recipes/rust/files/0005-CFG_CFLAGS-is-only-used-for-jemalloc-rename-all-uses.patch deleted file mode 100644 index e7ef130..0000000 --- a/recipes/rust/files/0005-CFG_CFLAGS-is-only-used-for-jemalloc-rename-all-uses.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 35be628efdfafd416e78505435b6a1d435d61c28 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Mon, 17 Nov 2014 13:20:28 -0500 -Subject: [PATCH 5/6] CFG_CFLAGS is only used for jemalloc, rename all uses to - CFG_JEMALLOC_CFLAGS - -i686-apple-ios already used CFG_JEMALLOC_CFLAGS, so merge that one ---- - mk/cfg/arm-apple-ios | 2 +- - mk/cfg/arm-linux-androideabi | 2 +- - mk/cfg/arm-unknown-linux-gnueabi | 2 +- - mk/cfg/arm-unknown-linux-gnueabihf | 2 +- - mk/cfg/i386-apple-ios | 3 +-- - mk/cfg/i686-apple-darwin | 2 +- - mk/cfg/i686-pc-windows-gnu | 2 +- - mk/cfg/i686-unknown-linux-gnu | 2 +- - mk/cfg/mips-unknown-linux-gnu | 2 +- - mk/cfg/mipsel-unknown-linux-gnu | 2 +- - mk/cfg/x86_64-apple-darwin | 2 +- - mk/cfg/x86_64-pc-windows-gnu | 2 +- - mk/cfg/x86_64-unknown-dragonfly | 2 +- - mk/cfg/x86_64-unknown-freebsd | 2 +- - mk/cfg/x86_64-unknown-linux-gnu | 2 +- - 15 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/mk/cfg/arm-apple-ios b/mk/cfg/arm-apple-ios -index 6a66ff4..d1f1ee6 100644 ---- a/mk/cfg/arm-apple-ios -+++ b/mk/cfg/arm-apple-ios -@@ -13,7 +13,7 @@ CFG_LIB_NAME_arm-apple-ios = lib$(1).a - CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a - CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a - CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM --CFG_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS) -+CFG_JEMALLOC_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS) - CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7 - CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1 - CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind -diff --git a/mk/cfg/arm-linux-androideabi b/mk/cfg/arm-linux-androideabi -index e24a805..471220e 100644 ---- a/mk/cfg/arm-linux-androideabi -+++ b/mk/cfg/arm-linux-androideabi -@@ -7,7 +7,7 @@ CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so - CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a - CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS) - CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS) - CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++ -diff --git a/mk/cfg/arm-unknown-linux-gnueabi b/mk/cfg/arm-unknown-linux-gnueabi -index 4b7b9ad..b4c604b 100644 ---- a/mk/cfg/arm-unknown-linux-gnueabi -+++ b/mk/cfg/arm-unknown-linux-gnueabi -@@ -8,7 +8,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so - CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a - CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS) - CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp $(CFLAGS) - CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g -diff --git a/mk/cfg/arm-unknown-linux-gnueabihf b/mk/cfg/arm-unknown-linux-gnueabihf -index 535dce6..4f02de0 100644 ---- a/mk/cfg/arm-unknown-linux-gnueabihf -+++ b/mk/cfg/arm-unknown-linux-gnueabihf -@@ -8,7 +8,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so - CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a - CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) - CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) - CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g -diff --git a/mk/cfg/i386-apple-ios b/mk/cfg/i386-apple-ios -index 0e0d272..63eb590 100644 ---- a/mk/cfg/i386-apple-ios -+++ b/mk/cfg/i386-apple-ios -@@ -13,7 +13,6 @@ CFG_LIB_NAME_i386-apple-ios = lib$(1).a - CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib - CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a - CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM --CFG_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) - CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS) - CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1 - CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK) -@@ -30,5 +29,5 @@ CFG_PATH_MUNGE_i386-apple-ios = true - CFG_LDPATH_i386-apple-ios = - CFG_RUN_i386-apple-ios = $(2) - CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2)) --CFG_JEMALLOC_CFLAGS_i386-apple-ios = -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind -+CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind - CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios -diff --git a/mk/cfg/i686-apple-darwin b/mk/cfg/i686-apple-darwin -index 97ab0b3..e935ce0 100644 ---- a/mk/cfg/i686-apple-darwin -+++ b/mk/cfg/i686-apple-darwin -@@ -7,7 +7,7 @@ CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib - CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a - CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib - CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_i686-apple-darwin := -m32 -arch i386 $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_i686-apple-darwin := -m32 -arch i386 $(CFLAGS) - CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386 $(CFLAGS) - CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -m32 -diff --git a/mk/cfg/i686-pc-windows-gnu b/mk/cfg/i686-pc-windows-gnu -index 52ed733..ecb405b 100644 ---- a/mk/cfg/i686-pc-windows-gnu -+++ b/mk/cfg/i686-pc-windows-gnu -@@ -8,7 +8,7 @@ CFG_LIB_NAME_i686-pc-windows-gnu=$(1).dll - CFG_STATIC_LIB_NAME_i686-pc-windows-gnu=$(1).lib - CFG_LIB_GLOB_i686-pc-windows-gnu=$(1)-*.dll - CFG_LIB_DSYM_GLOB_i686-pc-windows-gnu=$(1)-*.dylib.dSYM --CFG_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS) - CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS) - CFG_GCCISH_CXXFLAGS_i686-pc-windows-gnu := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_i686-pc-windows-gnu := -shared -g -m32 -diff --git a/mk/cfg/i686-unknown-linux-gnu b/mk/cfg/i686-unknown-linux-gnu -index 76ed56d..1cc9c14 100644 ---- a/mk/cfg/i686-unknown-linux-gnu -+++ b/mk/cfg/i686-unknown-linux-gnu -@@ -7,7 +7,7 @@ CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so - CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a - CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS) - CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) - CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32 -diff --git a/mk/cfg/mips-unknown-linux-gnu b/mk/cfg/mips-unknown-linux-gnu -index 1caecec..c5d8496 100644 ---- a/mk/cfg/mips-unknown-linux-gnu -+++ b/mk/cfg/mips-unknown-linux-gnu -@@ -7,7 +7,7 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so - CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a - CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS) - CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS) - CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32 -diff --git a/mk/cfg/mipsel-unknown-linux-gnu b/mk/cfg/mipsel-unknown-linux-gnu -index d761d5d..eb2f300 100644 ---- a/mk/cfg/mipsel-unknown-linux-gnu -+++ b/mk/cfg/mipsel-unknown-linux-gnu -@@ -7,7 +7,7 @@ CFG_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).so - CFG_STATIC_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).a - CFG_LIB_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_mipsel-unknown-linux-gnu := -mips32 -mabi=32 $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_mipsel-unknown-linux-gnu := -mips32 -mabi=32 $(CFLAGS) - CFG_GCCISH_CFLAGS_mipsel-unknown-linux-gnu := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS) - CFG_GCCISH_CXXFLAGS_mipsel-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_mipsel-unknown-linux-gnu := -shared -fPIC -g -mips32 -diff --git a/mk/cfg/x86_64-apple-darwin b/mk/cfg/x86_64-apple-darwin -index 5da7c92..dbd6754 100644 ---- a/mk/cfg/x86_64-apple-darwin -+++ b/mk/cfg/x86_64-apple-darwin -@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib - CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a - CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib - CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64 $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64 $(CFLAGS) - CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64 $(CFLAGS) - CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -m64 -diff --git a/mk/cfg/x86_64-pc-windows-gnu b/mk/cfg/x86_64-pc-windows-gnu -index 14ebdf5..a23e292 100644 ---- a/mk/cfg/x86_64-pc-windows-gnu -+++ b/mk/cfg/x86_64-pc-windows-gnu -@@ -8,7 +8,7 @@ CFG_LIB_NAME_x86_64-pc-windows-gnu=$(1).dll - CFG_STATIC_LIB_NAME_x86_64-pc-windows-gnu=$(1).lib - CFG_LIB_GLOB_x86_64-pc-windows-gnu=$(1)-*.dll - CFG_LIB_DSYM_GLOB_x86_64-pc-windows-gnu=$(1)-*.dylib.dSYM --CFG_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS) - CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS) - CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-gnu := -fno-rtti $(CXXFLAGS) - CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-gnu := -shared -g -m64 -diff --git a/mk/cfg/x86_64-unknown-dragonfly b/mk/cfg/x86_64-unknown-dragonfly -index 50928d3..05414c7 100644 ---- a/mk/cfg/x86_64-unknown-dragonfly -+++ b/mk/cfg/x86_64-unknown-dragonfly -@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).so - CFG_STATIC_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).a - CFG_LIB_GLOB_x86_64-unknown-dragonfly=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_x86_64-unknown-dragonfly=$(1)-*.dylib.dSYM --CFG_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS) - CFG_GCCISH_CFLAGS_x86_64-unknown-dragonfly := -Wall -Werror -g -fPIC -I/usr/include -I/usr/local/include $(CFLAGS) - CFG_GCCISH_LINK_FLAGS_x86_64-unknown-dragonfly := -shared -fPIC -g -pthread -lrt - CFG_GCCISH_DEF_FLAG_x86_64-unknown-dragonfly := -Wl,--export-dynamic,--dynamic-list= -diff --git a/mk/cfg/x86_64-unknown-freebsd b/mk/cfg/x86_64-unknown-freebsd -index 1926c98..4e847ea 100644 ---- a/mk/cfg/x86_64-unknown-freebsd -+++ b/mk/cfg/x86_64-unknown-freebsd -@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so - CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a - CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM --CFG_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include $(CFLAGS) -+CFG_JEMALLOC_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include $(CFLAGS) - CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include $(CFLAGS) - CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt - CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list= -diff --git a/mk/cfg/x86_64-unknown-linux-gnu b/mk/cfg/x86_64-unknown-linux-gnu -index 5f165ad..845f9c1 100644 ---- a/mk/cfg/x86_64-unknown-linux-gnu -+++ b/mk/cfg/x86_64-unknown-linux-gnu -@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so - CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a - CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so - CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM --CFG_CFLAGS_x86_64-unknown-linux-gnu := -m64 -+CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-gnu := -m64 - CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64 - CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti - CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64 --- -2.1.3 - diff --git a/recipes/rust/files/0006-mk-rt-jemalloc-pass-CFG_GCCISH_CFLAGS-inside-CC-inst.patch b/recipes/rust/files/0006-mk-rt-jemalloc-pass-CFG_GCCISH_CFLAGS-inside-CC-inst.patch deleted file mode 100644 index acc73c3..0000000 --- a/recipes/rust/files/0006-mk-rt-jemalloc-pass-CFG_GCCISH_CFLAGS-inside-CC-inst.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b9cbb276d18e8250ca7fdbe7c038ccc39e33072f Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Mon, 17 Nov 2014 13:10:48 -0500 -Subject: [PATCH 6/6] mk/rt/jemalloc: pass CFG_GCCISH_CFLAGS inside CC instead - of passing CFG_CFLAGS in EXTRA_CFLAGS - - - CFG_CFLAGS is gone (it was previously only used by jemalloc anyhow). - - CFG_JEMALLOC_CFLAGS may contain flags needed for the compiler to - function (produce a binary output). - - jemalloc's configure runs $(CC) without EXTRA_CFLAGS, and (without - this change) will fail if any flags are required for CC to work. ---- - mk/rt.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mk/rt.mk b/mk/rt.mk -index 7204808..a7d6a6e 100644 ---- a/mk/rt.mk -+++ b/mk/rt.mk -@@ -177,11 +177,11 @@ $$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS) - cd "$$(JEMALLOC_BUILD_DIR_$(1))"; "$(S)src/jemalloc/configure" \ - $$(JEMALLOC_ARGS_$(1)) --with-jemalloc-prefix=je_ $(CFG_JEMALLOC_FLAGS) \ - --build=$$(CFG_GNU_TRIPLE_$(CFG_BUILD)) --host=$$(CFG_GNU_TRIPLE_$(1)) \ -- CC="$$(CC_$(1))" \ -+ CC="$$(CC_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1))" \ - AR="$$(AR_$(1))" \ - RANLIB="$$(AR_$(1)) s" \ - CPPFLAGS="-I $(S)src/rt/" \ -- EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1)) -g1" -+ EXTRA_CFLAGS="-g1" - $$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static - - ifeq ($$(CFG_DISABLE_JEMALLOC),) --- -2.1.3 -