commit: 770e5d6fdf74b2312b2049fe471c7c9c031486b4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 16:51:16 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 16:51:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770e5d6f
sci-electronics/klayout: Use CFLAGS etc
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../klayout/files/klayout-9999-expert.patch | 104 +++++++++++++++++++++
sci-electronics/klayout/klayout-9999.ebuild | 7 +-
2 files changed, 108 insertions(+), 3 deletions(-)
diff --git a/sci-electronics/klayout/files/klayout-9999-expert.patch
b/sci-electronics/klayout/files/klayout-9999-expert.patch
new file mode 100644
index 00000000000..6fb1b873430
--- /dev/null
+++ b/sci-electronics/klayout/files/klayout-9999-expert.patch
@@ -0,0 +1,104 @@
+diff --git a/build.sh b/build.sh
+index ad9ac30..6a61904 100755
+--- a/build.sh
++++ b/build.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ #
+ # KLayout Layout Viewer
+@@ -44,6 +44,7 @@ RPATH=""
+ MAKE_OPT=""
+
+ CONFIG="release"
++BUILD_EXPERT=0
+
+ # Check, whether build.sh is run from the top level folder
+ if ! [ -e src ] || ! [ -e src/klayout.pro ]; then
+@@ -75,6 +76,9 @@ while [ "$*" != "" ]; do
+ -debug)
+ CONFIG="debug"
+ ;;
++ -expert)
++ BUILD_EXPERT=1
++ ;;
+ -python)
+ PYTHON="$1"
+ shift
+@@ -500,28 +504,53 @@ $QMAKE -v
+ # Force a minimum rebuild because of version info
+ touch $CURR_DIR/src/version/version.h
+
+-qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \
+- CONFIG+=$CONFIG \
+- RUBYLIBFILE=$RUBYLIBFILE \
+- RUBYINCLUDE=$RUBYINCLUDE \
+- RUBYINCLUDE2=$RUBYINCLUDE2 \
+- RUBYVERSIONCODE=$RUBYVERSIONCODE \
+- HAVE_RUBY=$HAVE_RUBY \
+- PYTHONLIBFILE=$PYTHONLIBFILE \
+- PYTHONINCLUDE=$PYTHONINCLUDE \
+- HAVE_PYTHON=$HAVE_PYTHON \
+- HAVE_QTBINDINGS=$HAVE_QTBINDINGS \
+- HAVE_64BIT_COORD=$HAVE_64BIT_COORD \
+- HAVE_QT5=$HAVE_QT5 \
+- PREFIX='$BIN' \
+- RPATH='$RPATH' \
+- KLAYOUT_VERSION=$KLAYOUT_VERSION \
+- KLAYOUT_VERSION_DATE=$KLAYOUT_VERSION_DATE \
+- KLAYOUT_VERSION_REV=$KLAYOUT_VERSION_REV \
+-"
+-
+-echo $qmake_cmd
+-$qmake_cmd
++qmake_options=(
++ -recursive
++ CONFIG+="$CONFIG"
++ RUBYLIBFILE="$RUBYLIBFILE"
++ RUBYINCLUDE="$RUBYINCLUDE"
++ RUBYINCLUDE2="$RUBYINCLUDE2"
++ RUBYVERSIONCODE="$RUBYVERSIONCODE"
++ HAVE_RUBY="$HAVE_RUBY"
++ PYTHONLIBFILE="$PYTHONLIBFILE"
++ PYTHONINCLUDE="$PYTHONINCLUDE"
++ HAVE_PYTHON="$HAVE_PYTHON"
++ HAVE_QTBINDINGS="$HAVE_QTBINDINGS"
++ HAVE_64BIT_COORD="$HAVE_64BIT_COORD"
++ HAVE_QT5="$HAVE_QT5"
++ PREFIX="$BIN"
++ RPATH="$RPATH"
++ KLAYOUT_VERSION="$KLAYOUT_VERSION"
++ KLAYOUT_VERSION_DATE="$KLAYOUT_VERSION_DATE"
++ KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV"
++)
++
++if [ $BUILD_EXPERT = 1 ]; then
++ qmake_options+=(
++ QMAKE_AR="$AR cqs"
++ QMAKE_LINK_C="$CC"
++ QMAKE_LINK_C_SHLIB="$CC"
++ QMAKE_LINK="$CXX"
++ QMAKE_LINK_SHLIB="$CXX"
++ QMAKE_OBJCOPY="$OBJCOPY"
++ QMAKE_RANLIB=
++ QMAKE_STRIP=
++ QMAKE_CC="$CC"
++ QMAKE_CXX="$CXX"
++ QMAKE_CFLAGS="$CFLAGS"
++ QMAKE_CFLAGS_RELEASE=
++ QMAKE_CFLAGS_DEBUG=
++ QMAKE_CXXFLAGS="$CXXFLAGS"
++ QMAKE_CXXFLAGS_RELEASE=
++ QMAKE_CXXFLAGS_DEBUG=
++ QMAKE_LFLAGS="$LDFLAGS"
++ QMAKE_LFLAGS_RELEASE=
++ QMAKE_LFLAGS_DEBUG=
++ )
++fi
++
++echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
++$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
+
+ cd $CURR_DIR
+ echo ""
diff --git a/sci-electronics/klayout/klayout-9999.ebuild
b/sci-electronics/klayout/klayout-9999.ebuild
index 8b43bc444d3..a23a11d67fb 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -35,14 +35,15 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-all_ruby_prepare() {
- default
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-expert.patch"
+)
each_ruby_configure() {
tc-export CC CXX AR LD RANLIB
export CFLAGS CXXFLAGS
./build.sh \
+ -expert \
-dry-run \
-qmake /usr/lib64/qt5/bin/qmake \
-ruby "${RUBY}" \
