diff options
| author | Thomas Hebb | 2022-05-08 13:51:26 -0700 |
|---|---|---|
| committer | Thomas Hebb | 2022-05-08 13:51:26 -0700 |
| commit | ce834976de66862ce1096eae0eef44a8b9b2cb9b (patch) | |
| tree | 35d107922107b4b53c18d71312074c773f73556c | |
| parent | c8a5ba4db75a94fde3d5c7029aa04e946bc4158b (diff) | |
| download | aur-ce834976de66862ce1096eae0eef44a8b9b2cb9b.tar.gz | |
Patch Makefiles to respect makepkg's CFLAGS/LDFLAGS
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 3 | ||||
| -rw-r--r-- | makepkg-cflags.patch | 128 |
3 files changed, 133 insertions, 0 deletions
@@ -16,9 +16,11 @@ pkgbase = usbdm-git options = !makeflags source = git+https://github.com/podonoghue/usbdm-eclipse-makefiles-build.git source = undebian.patch + source = makepkg-cflags.patch source = 60-usbdm.rules sha256sums = SKIP sha256sums = 1df36643f505b6869e3135f43ff1e738b25b19be58a3742978158873898f6e13 + sha256sums = d1e58e0a45c2eed831171850b3594ad01521a192f3271f4deab65453a22c71b2 sha256sums = 88eaab73a1020ac84d4979a4f70f122214b0042d167942a95bddd0560f0e3aa8 pkgname = usbdm-git @@ -15,9 +15,11 @@ install="usbdm.install" source=("git+https://github.com/podonoghue/usbdm-eclipse-makefiles-build.git" "undebian.patch" + "makepkg-cflags.patch" "60-usbdm.rules") sha256sums=('SKIP' '1df36643f505b6869e3135f43ff1e738b25b19be58a3742978158873898f6e13' + 'd1e58e0a45c2eed831171850b3594ad01521a192f3271f4deab65453a22c71b2' '88eaab73a1020ac84d4979a4f70f122214b0042d167942a95bddd0560f0e3aa8') pkgver() { @@ -28,6 +30,7 @@ pkgver() { prepare() { cd "${srcdir}/usbdm-eclipse-makefiles-build" patch -p1 -i "${srcdir}/undebian.patch" + patch -p1 -i "${srcdir}/makepkg-cflags.patch" sed -i -e 's/xercesc_3_1/xercesc/g' 'MergeXML/src/xmlParser.h' } diff --git a/makepkg-cflags.patch b/makepkg-cflags.patch new file mode 100644 index 000000000000..5ed2a1acad10 --- /dev/null +++ b/makepkg-cflags.patch @@ -0,0 +1,128 @@ +From ee0348722629ecafee9d1db3c0d37d149622521c Mon Sep 17 00:00:00 2001 +Message-Id: <ee0348722629ecafee9d1db3c0d37d149622521c.1652042168.git.tommyhebb@gmail.com> +In-Reply-To: <11c8680c8d0ec0e9c834f57efdfd3827453f4c6a.1652042168.git.tommyhebb@gmail.com> +References: <11c8680c8d0ec0e9c834f57efdfd3827453f4c6a.1652042168.git.tommyhebb@gmail.com> +From: Thomas Hebb <tommyhebb@gmail.com> +Date: Sun, 8 May 2022 13:04:07 -0700 +Subject: [PATCH 2/2] Don't set our own CFLAGS and LDFLAGS + +Instead, use the ones from the environment as much as possible. makepkg +is opinionated about what flags to set, and we want to respect them. +--- + Common.mk | 11 +---------- + Library.mk | 11 +---------- + USBDM_API_Example/Common.mk | 11 +---------- + USBDM_Programmer_API_Example/Common.mk | 11 +---------- + 4 files changed, 4 insertions(+), 40 deletions(-) + +diff --git a/Common.mk b/Common.mk +index aa94a528..18eea2b4 100755 +--- a/Common.mk ++++ b/Common.mk +@@ -302,21 +302,12 @@ ifeq ($(UNAME_S),Windows) + else + GCC_VISIBILITY_DEFS :=-fvisibility=hidden -fvisibility-inlines-hidden + THREADS := +- CFLAGS := -fPIC ++ CFLAGS += -fPIC + endif + + ifdef DEBUG +- # Compiler flags +- CFLAGS += -O0 -g3 +- # Compiler flags (Linking) +- LDFLAGS = -O0 -g3 + # C Definitions + DEFS := -DLOG +-else +- # Compiler flags +- CFLAGS += -O3 -g3 +- # Compiler flags (Linking) - include DEBUG info as can be stripped later +- LDFLAGS = -O3 -g3 + endif + + ifneq ($(UNAME_S),Windows) +diff --git a/Library.mk b/Library.mk +index 76b8047d..d7fb7393 100644 +--- a/Library.mk ++++ b/Library.mk +@@ -286,21 +286,12 @@ ifeq ($(UNAME_S),Windows) + else + GCC_VISIBILITY_DEFS :=-fvisibility=hidden -fvisibility-inlines-hidden + THREADS := +- CFLAGS := -fPIC ++ CFLAGS += -fPIC + endif + + ifdef DEBUG +- # Compiler flags +- CFLAGS += -O0 -g3 +- # Compiler flags (Linking) +- LDFLAGS = + # C Definitions + DEFS := -DLOG +-else +- # Compiler flags +- CFLAGS += -O3 -g0 +- # Compiler flags (Linking) +- LDFLAGS = -s + endif + + ifneq ($(OS),Windows_NT) +diff --git a/USBDM_API_Example/Common.mk b/USBDM_API_Example/Common.mk +index bc877eab..32f82fc5 100755 +--- a/USBDM_API_Example/Common.mk ++++ b/USBDM_API_Example/Common.mk +@@ -303,21 +303,12 @@ ifeq ($(UNAME_S),Windows) + else + GCC_VISIBILITY_DEFS :=-fvisibility=hidden -fvisibility-inlines-hidden + THREADS := +- CFLAGS := -fPIC ++ CFLAGS += -fPIC + endif + + ifdef DEBUG +- # Compiler flags +- CFLAGS += -O0 -g3 +- # Compiler flags (Linking) +- LDFLAGS = -O0 -g3 + # C Definitions + DEFS := -DLOG +-else +- # Compiler flags +- CFLAGS += -O3 -g3 +- # Compiler flags (Linking) - include DEBUG info as can be stripped later +- LDFLAGS = -O3 -g3 + endif + + ifneq ($(UNAME_S),Windows) +diff --git a/USBDM_Programmer_API_Example/Common.mk b/USBDM_Programmer_API_Example/Common.mk +index bc877eab..32f82fc5 100755 +--- a/USBDM_Programmer_API_Example/Common.mk ++++ b/USBDM_Programmer_API_Example/Common.mk +@@ -303,21 +303,12 @@ ifeq ($(UNAME_S),Windows) + else + GCC_VISIBILITY_DEFS :=-fvisibility=hidden -fvisibility-inlines-hidden + THREADS := +- CFLAGS := -fPIC ++ CFLAGS += -fPIC + endif + + ifdef DEBUG +- # Compiler flags +- CFLAGS += -O0 -g3 +- # Compiler flags (Linking) +- LDFLAGS = -O0 -g3 + # C Definitions + DEFS := -DLOG +-else +- # Compiler flags +- CFLAGS += -O3 -g3 +- # Compiler flags (Linking) - include DEBUG info as can be stripped later +- LDFLAGS = -O3 -g3 + endif + + ifneq ($(UNAME_S),Windows) +-- +2.36.0 + |