* [PATCH,V2 1/2] libctf: remove unnecessary zlib constructs
2022-12-11 0:10 [PATCH,V2 0/2] Small improvements to libctf configure.ac Indu Bhagat
@ 2022-12-11 0:10 ` Indu Bhagat
2022-12-11 7:32 ` Mike Frysinger
2022-12-11 0:10 ` [PATCH,V2 2/2] libctf: remove AC_CONFIG_MACRO_DIR Indu Bhagat
1 sibling, 1 reply; 5+ messages in thread
From: Indu Bhagat @ 2022-12-11 0:10 UTC (permalink / raw)
To: binutils; +Cc: vapier, Indu Bhagat
[Changes in V2]
- Stick to the intended effect (remove only zlib constructs). Added back
the $ZSTD_LIBS.
- Will discuss removal of AC_ZSTD in a separate patch.
I am not sure of the future plans for zstd compressed CTF sections, so I
would rather take that in a separate patch.
[End of changes in V2]
------------
This dependency is managed via libtool. So explicit addition to LDFLAGS
and LIBS is not necessary anymore.
ChangeLog:
* libctf/configure: Regenerated.
* libctf/configure.ac: remove zlib from LDFLAGS and LIBS.
---
libctf/configure | 5 ++---
libctf/configure.ac | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libctf/configure b/libctf/configure
index d3d63407cf0..cdfc0008fe5 100755
--- a/libctf/configure
+++ b/libctf/configure
@@ -14579,10 +14579,9 @@ OLD_CC=$CC
# always want our bfd.
CC="./libtool --quiet --mode=link $OLD_CC"
CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'`
-LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS"
+LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
-LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS"
+LIBS="-lbfd -liberty $ZSTD_LIBS $intl $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5
$as_echo_n "checking for ELF support in BFD... " >&6; }
if ${ac_cv_libctf_bfd_elf+:} false; then :
diff --git a/libctf/configure.ac b/libctf/configure.ac
index ba4a144ce37..652e95e3968 100644
--- a/libctf/configure.ac
+++ b/libctf/configure.ac
@@ -90,10 +90,9 @@ OLD_CC=$CC
# always want our bfd.
CC="./libtool --quiet --mode=link $OLD_CC"
CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'`
-LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS"
+LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
-LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS"
+LIBS="-lbfd -liberty $ZSTD_LIBS $intl $LIBS"
AC_CACHE_CHECK([for ELF support in BFD], ac_cv_libctf_bfd_elf,
[AC_TRY_LINK([#include <stdlib.h>
#include <string.h>
--
2.37.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH,V2 2/2] libctf: remove AC_CONFIG_MACRO_DIR
2022-12-11 0:10 [PATCH,V2 0/2] Small improvements to libctf configure.ac Indu Bhagat
2022-12-11 0:10 ` [PATCH,V2 1/2] libctf: remove unnecessary zlib constructs Indu Bhagat
@ 2022-12-11 0:10 ` Indu Bhagat
2022-12-11 7:32 ` Mike Frysinger
1 sibling, 1 reply; 5+ messages in thread
From: Indu Bhagat @ 2022-12-11 0:10 UTC (permalink / raw)
To: binutils; +Cc: vapier, Indu Bhagat
[no changes in v2]
ACLOCAL_AMFLAGS is being set already. So using AC_CONFIG_MACRO_DIR is
unnecessary.
ChangeLog:
* libctf/configure: Regenerated.
* libctf/configure.ac: remove AC_CONFIG_MACRO_DIR usage.
---
libctf/configure | 7 ++-----
libctf/configure.ac | 3 ---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/libctf/configure b/libctf/configure
index cdfc0008fe5..82c3fb0588d 100755
--- a/libctf/configure
+++ b/libctf/configure
@@ -2328,9 +2328,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -11655,7 +11652,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11658 "configure"
+#line 11655 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11761,7 +11758,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11764 "configure"
+#line 11761 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libctf/configure.ac b/libctf/configure.ac
index 652e95e3968..0e0495ba6ef 100644
--- a/libctf/configure.ac
+++ b/libctf/configure.ac
@@ -21,9 +21,6 @@ dnl
AC_PREREQ(2.64)
AC_INIT([libctf], 1.2.0)
AC_CONFIG_SRCDIR(ctf-impl.h)
-AC_CONFIG_MACRO_DIR(..)
-AC_CONFIG_MACRO_DIR(../config)
-AC_CONFIG_MACRO_DIR(../bfd)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
--
2.37.2
^ permalink raw reply [flat|nested] 5+ messages in thread