commit:     a4ae4ba0d02e3bddad41991715b21fa7e062abd3
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 19:13:53 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 19:14:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ae4ba0

dev-tcltk/tix: do not overwrite user's optimization

Closes: https://bugs.gentoo.org/886993
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-tcltk/tix/files/tix-8.4.3-noopt.patch          | 38 ++++++++++++++++++++++
 .../{tix-8.4.3-r3.ebuild => tix-8.4.3-r4.ebuild}   |  4 +++
 2 files changed, 42 insertions(+)

diff --git a/dev-tcltk/tix/files/tix-8.4.3-noopt.patch 
b/dev-tcltk/tix/files/tix-8.4.3-noopt.patch
new file mode 100644
index 000000000000..14a36374d292
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-noopt.patch
@@ -0,0 +1,38 @@
+--- a/tclconfig/tcl.m4 2023-01-18 20:03:02.719671952 +0100
++++ b/tclconfig/tcl.m4 2023-01-18 20:07:22.110504323 +0100
+@@ -981,9 +981,7 @@
+     ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
+     TCL_LIB_VERSIONS_OK=ok
+     CFLAGS_DEBUG=-g
+-    CFLAGS_OPTIMIZE=-O
+     if test "$GCC" = "yes" ; then
+-      CFLAGS_OPTIMIZE=-O2
+       CFLAGS_WARNING="-Wall -Wno-implicit-int"
+     else
+       CFLAGS_WARNING=""
+@@ -1445,7 +1443,6 @@
+           SHLIB_LD_LIBS='${LIBS}'
+           SHLIB_SUFFIX=".so"
+ 
+-          CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
+           # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 
+           # when you inline the string and math operations.  Turn this off to
+           # get rid of the warnings.
+@@ -3158,17 +3155,6 @@
+     # It makes compiling go faster.  (This is only a performance feature.)
+     #------------------------------------------------------------------------
+ 
+-    if test -z "$no_pipe" -a -n "$GCC"; then
+-      AC_CACHE_CHECK([if the compiler understands -pipe],
+-          tcl_cv_cc_pipe, [
+-          hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
+-          AC_TRY_COMPILE(,, tcl_cv_cc_pipe=yes, tcl_cv_cc_pipe=no)
+-          CFLAGS=$hold_cflags])
+-      if test $tcl_cv_cc_pipe = yes; then
+-          CFLAGS="$CFLAGS -pipe"
+-      fi
+-    fi
+-
+     #--------------------------------------------------------------------
+     # Common compiler flag setup
+     #--------------------------------------------------------------------

diff --git a/dev-tcltk/tix/tix-8.4.3-r3.ebuild 
b/dev-tcltk/tix/tix-8.4.3-r4.ebuild
similarity index 95%
rename from dev-tcltk/tix/tix-8.4.3-r3.ebuild
rename to dev-tcltk/tix/tix-8.4.3-r4.ebuild
index b1aa7a279451..8d589a306097 100644
--- a/dev-tcltk/tix/tix-8.4.3-r3.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r4.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 MY_P="Tix${PV}"
 DESCRIPTION="A widget library for Tcl/Tk"
 HOMEPAGE="http://tix.sourceforge.net/";
@@ -28,6 +30,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-tcl8.6.patch
        "${FILESDIR}"/${P}-wimplicit-int.patch
        "${FILESDIR}"/${P}-clang6.patch
+       "${FILESDIR}"/${P}-noopt.patch
 )
 
 src_prepare() {
@@ -37,6 +40,7 @@ src_prepare() {
                -e 's:-Os::g' \
                -i configure tclconfig/tcl.m4 || die
        default
+       eautoreconf
 }
 
 src_configure() {

Reply via email to