From dd9a7239f8d7791779a586130f3d78162b4e8905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 29 Sep 2020 12:57:16 +0200 Subject: [PATCH] gdb: clean up template redundancies See: #25159 --- srcpkgs/gdb/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index 2356cadc808..7cbad76b062 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -25,8 +25,8 @@ if [ "${CROSS_BUILD}" ]; then CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" fi -CFLAGS+=" -fcommon -Wno-error" -CXXFLAGS+=" -fcommon -Wno-error" +CFLAGS+=" -fcommon" +CXXFLAGS+=" -fcommon" # Package build options build_options="gdbserver static python" desc_option_gdbserver="Enable support for building GDB server" @@ -40,7 +40,7 @@ post_extract() { mkdir -p build } do_configure() { - cd ${wrksrc}/build + cd build ../configure ${configure_args/with-sysroot/with-build-sysroot} \ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon" export gl_cv_func_gettimeofday_clobber=no @@ -48,15 +48,14 @@ do_configure() { export gl_cv_func_strerror_0_works=yes } do_build() { - cd ${wrksrc}/build + cd build make ${makejobs} all } do_install() { - cd ${wrksrc}/build + cd build make DESTDIR=${DESTDIR} ${makejobs} install # resolve conflicts with binutils - rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib - [ -d ${DESTDIR}/usr/lib64 ] && rm -rf ${DESTDIR}/usr/lib64 + rm -rf ${DESTDIR}/usr/{include,lib,lib64} for f in bfd configure standards; do rm -f ${DESTDIR}/usr/share/info/${f}.info* done