package/dmalloc: use actual patches rather than sed-ing
Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's been some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Note-3: we patch both configure and configure.ac, rather than autoreconf, for two reasons: 1. the both are in the upstream git tree, so submitting these patches would require patching both, and 2. dmalloc does not autoreconf nicely out of the box, and it was deemed too much hassle to fix that in addition. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yann E. MORIN
Thomas Petazzoni
parent
a7bd0fdb88
commit
b259dac22a
@ -0,0 +1,80 @@
|
||||
From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Wed, 8 Feb 2023 13:26:56 +0100
|
||||
Subject: [PATCH] configure: allow overriding some tests
|
||||
|
||||
Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation.
|
||||
|
||||
Allow the user to provide these results from the environment.
|
||||
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
configure | 6 +++---
|
||||
configure.ac | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index c18dfb2..d165962 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4540,7 +4540,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5
|
||||
$as_echo_n "checking strdup macro... " >&6; }
|
||||
if test "$cross_compiling" = yes; then :
|
||||
- ac_cv_strdup_macro=no
|
||||
+ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"
|
||||
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5
|
||||
$as_echo_n "checking strndup macro... " >&6; }
|
||||
if test "$cross_compiling" = yes; then :
|
||||
- ac_cv_strndup_macro=no
|
||||
+ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"
|
||||
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
@@ -4753,7 +4753,7 @@ done
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5
|
||||
$as_echo_n "checking basic-block size... " >&6; }
|
||||
-ac_cv_page_size=0
|
||||
+ac_cv_page_size="${ac_cv_page_size-0}"
|
||||
if test $ac_cv_page_size = 0; then
|
||||
if test "$cross_compiling" = yes; then :
|
||||
ac_cv_page_size=0
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9740fdc..51bdf4d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -292,7 +292,7 @@ int main() { return 1; }
|
||||
]])],
|
||||
[ac_cv_strdup_macro=yes],
|
||||
[ac_cv_strdup_macro=no],
|
||||
-[ac_cv_strdup_macro=no]
|
||||
+[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"]
|
||||
)
|
||||
AC_MSG_RESULT([$ac_cv_strdup_macro])
|
||||
|
||||
@@ -316,7 +316,7 @@ int main() { return 1; }
|
||||
]])],
|
||||
[ac_cv_strndup_macro=yes],
|
||||
[ac_cv_strndup_macro=no],
|
||||
-[ac_cv_strndup_macro=no]
|
||||
+[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"]
|
||||
)
|
||||
AC_MSG_RESULT([$ac_cv_strndup_macro])
|
||||
|
||||
@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap])
|
||||
#
|
||||
AC_CHECK_FUNCS(getpagesize)
|
||||
AC_MSG_CHECKING([basic-block size])
|
||||
-ac_cv_page_size=0
|
||||
+ac_cv_page_size="${ac_cv_page_size-0}"
|
||||
if test $ac_cv_page_size = 0; then
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
#if HAVE_UNISTD_H
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Wed, 8 Feb 2023 13:43:55 +0100
|
||||
Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar
|
||||
program
|
||||
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
Makefile.in | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 86d3cca..089ac99 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY)
|
||||
mv $@.t $@
|
||||
|
||||
$(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
|
||||
- ar cr $@ $?
|
||||
+ $(AR) cr $@ $?
|
||||
@RANLIB@ $@
|
||||
|
||||
$(LIB_TH) : $(OBJS) $(THREAD_OBJS)
|
||||
- ar cr $@ $?
|
||||
+ $(AR) cr $@ $?
|
||||
@RANLIB@ $@
|
||||
|
||||
$(LIB_TH_SL) : $(LIB_TH)
|
||||
@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH)
|
||||
mv $@.t $@
|
||||
|
||||
$(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
|
||||
- ar cr $@ $?
|
||||
+ $(AR) cr $@ $?
|
||||
@RANLIB@ $@
|
||||
|
||||
$(LIB_CXX_SL) : $(LIB_CXX)
|
||||
@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX)
|
||||
mv $@.t $@
|
||||
|
||||
$(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
|
||||
- ar cr $@ $?
|
||||
+ $(AR) cr $@ $?
|
||||
@RANLIB@ $@
|
||||
|
||||
$(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Wed, 8 Feb 2023 13:52:05 +0100
|
||||
Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld'
|
||||
|
||||
When doing cross-compilation, we do not want to use the native tools to
|
||||
test, but the target tools.
|
||||
|
||||
Note that the weird quoting is inherited from a legacy patch in
|
||||
Buildroot, which dates back ages (at least 2006), and as it has not been
|
||||
identified as breaking things, we keep it as-is... Meh...
|
||||
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
configure | 12 ++++++------
|
||||
configure.ac | 12 ++++++------
|
||||
2 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 810636e..30a7ea3 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
||||
ac_cv_shared_link_args='# Could not configure shlib linking'
|
||||
enable_shlib=no
|
||||
fi
|
||||
- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
|
||||
- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t'
|
||||
- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
|
||||
- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all'
|
||||
- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then
|
||||
- ac_cv_shared_link_args='ld -G -o $@.t'
|
||||
+ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
|
||||
+ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t'
|
||||
+ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
|
||||
+ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all'
|
||||
+ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then
|
||||
+ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t'
|
||||
else
|
||||
# oh well, toss an error
|
||||
ac_cv_shared_link_args='# Could not configure shlib linking'
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 51bdf4d..0d80a78 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[
|
||||
ac_cv_shared_link_args='# Could not configure shlib linking'
|
||||
enable_shlib=no
|
||||
fi
|
||||
- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
|
||||
- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t'
|
||||
- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
|
||||
- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all'
|
||||
- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then
|
||||
- ac_cv_shared_link_args='ld -G -o $@.t'
|
||||
+ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then
|
||||
+ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t'
|
||||
+ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then
|
||||
+ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all'
|
||||
+ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then
|
||||
+ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t'
|
||||
else
|
||||
# oh well, toss an error
|
||||
ac_cv_shared_link_args='# Could not configure shlib linking'
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y)
|
||||
DMALLOC_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)"
|
||||
|
||||
define DMALLOC_POST_PATCH
|
||||
$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
|
||||
$(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure
|
||||
$(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure
|
||||
$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
|
||||
$(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure
|
||||
$(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in
|
||||
endef
|
||||
|
||||
DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH
|
||||
DMALLOC_CONF_ENV = \
|
||||
CFLAGS="$(DMALLOC_CFLAGS)" \
|
||||
ac_cv_page_size=12 \
|
||||
ac_cv_strdup_macro=yes \
|
||||
ac_cv_strndup_macro=yes
|
||||
|
||||
# both DESTDIR and PREFIX are ignored..
|
||||
define DMALLOC_INSTALL_STAGING_CMDS
|
||||
|
||||
Loading…
Reference in New Issue
Block a user