| 1 |
commit: 770e5d6fdf74b2312b2049fe471c7c9c031486b4 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 30 16:51:16 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 30 16:51:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770e5d6f |
| 7 |
|
| 8 |
sci-electronics/klayout: Use CFLAGS etc |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 11 |
|
| 12 |
.../klayout/files/klayout-9999-expert.patch | 104 +++++++++++++++++++++ |
| 13 |
sci-electronics/klayout/klayout-9999.ebuild | 7 +- |
| 14 |
2 files changed, 108 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-electronics/klayout/files/klayout-9999-expert.patch b/sci-electronics/klayout/files/klayout-9999-expert.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..6fb1b873430 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-electronics/klayout/files/klayout-9999-expert.patch |
| 21 |
@@ -0,0 +1,104 @@ |
| 22 |
+diff --git a/build.sh b/build.sh |
| 23 |
+index ad9ac30..6a61904 100755 |
| 24 |
+--- a/build.sh |
| 25 |
++++ b/build.sh |
| 26 |
+@@ -1,4 +1,4 @@ |
| 27 |
+-#!/bin/sh |
| 28 |
++#!/bin/bash |
| 29 |
+ |
| 30 |
+ # |
| 31 |
+ # KLayout Layout Viewer |
| 32 |
+@@ -44,6 +44,7 @@ RPATH="" |
| 33 |
+ MAKE_OPT="" |
| 34 |
+ |
| 35 |
+ CONFIG="release" |
| 36 |
++BUILD_EXPERT=0 |
| 37 |
+ |
| 38 |
+ # Check, whether build.sh is run from the top level folder |
| 39 |
+ if ! [ -e src ] || ! [ -e src/klayout.pro ]; then |
| 40 |
+@@ -75,6 +76,9 @@ while [ "$*" != "" ]; do |
| 41 |
+ -debug) |
| 42 |
+ CONFIG="debug" |
| 43 |
+ ;; |
| 44 |
++ -expert) |
| 45 |
++ BUILD_EXPERT=1 |
| 46 |
++ ;; |
| 47 |
+ -python) |
| 48 |
+ PYTHON="$1" |
| 49 |
+ shift |
| 50 |
+@@ -500,28 +504,53 @@ $QMAKE -v |
| 51 |
+ # Force a minimum rebuild because of version info |
| 52 |
+ touch $CURR_DIR/src/version/version.h |
| 53 |
+ |
| 54 |
+-qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \ |
| 55 |
+- CONFIG+=$CONFIG \ |
| 56 |
+- RUBYLIBFILE=$RUBYLIBFILE \ |
| 57 |
+- RUBYINCLUDE=$RUBYINCLUDE \ |
| 58 |
+- RUBYINCLUDE2=$RUBYINCLUDE2 \ |
| 59 |
+- RUBYVERSIONCODE=$RUBYVERSIONCODE \ |
| 60 |
+- HAVE_RUBY=$HAVE_RUBY \ |
| 61 |
+- PYTHONLIBFILE=$PYTHONLIBFILE \ |
| 62 |
+- PYTHONINCLUDE=$PYTHONINCLUDE \ |
| 63 |
+- HAVE_PYTHON=$HAVE_PYTHON \ |
| 64 |
+- HAVE_QTBINDINGS=$HAVE_QTBINDINGS \ |
| 65 |
+- HAVE_64BIT_COORD=$HAVE_64BIT_COORD \ |
| 66 |
+- HAVE_QT5=$HAVE_QT5 \ |
| 67 |
+- PREFIX='$BIN' \ |
| 68 |
+- RPATH='$RPATH' \ |
| 69 |
+- KLAYOUT_VERSION=$KLAYOUT_VERSION \ |
| 70 |
+- KLAYOUT_VERSION_DATE=$KLAYOUT_VERSION_DATE \ |
| 71 |
+- KLAYOUT_VERSION_REV=$KLAYOUT_VERSION_REV \ |
| 72 |
+-" |
| 73 |
+- |
| 74 |
+-echo $qmake_cmd |
| 75 |
+-$qmake_cmd |
| 76 |
++qmake_options=( |
| 77 |
++ -recursive |
| 78 |
++ CONFIG+="$CONFIG" |
| 79 |
++ RUBYLIBFILE="$RUBYLIBFILE" |
| 80 |
++ RUBYINCLUDE="$RUBYINCLUDE" |
| 81 |
++ RUBYINCLUDE2="$RUBYINCLUDE2" |
| 82 |
++ RUBYVERSIONCODE="$RUBYVERSIONCODE" |
| 83 |
++ HAVE_RUBY="$HAVE_RUBY" |
| 84 |
++ PYTHONLIBFILE="$PYTHONLIBFILE" |
| 85 |
++ PYTHONINCLUDE="$PYTHONINCLUDE" |
| 86 |
++ HAVE_PYTHON="$HAVE_PYTHON" |
| 87 |
++ HAVE_QTBINDINGS="$HAVE_QTBINDINGS" |
| 88 |
++ HAVE_64BIT_COORD="$HAVE_64BIT_COORD" |
| 89 |
++ HAVE_QT5="$HAVE_QT5" |
| 90 |
++ PREFIX="$BIN" |
| 91 |
++ RPATH="$RPATH" |
| 92 |
++ KLAYOUT_VERSION="$KLAYOUT_VERSION" |
| 93 |
++ KLAYOUT_VERSION_DATE="$KLAYOUT_VERSION_DATE" |
| 94 |
++ KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV" |
| 95 |
++) |
| 96 |
++ |
| 97 |
++if [ $BUILD_EXPERT = 1 ]; then |
| 98 |
++ qmake_options+=( |
| 99 |
++ QMAKE_AR="$AR cqs" |
| 100 |
++ QMAKE_LINK_C="$CC" |
| 101 |
++ QMAKE_LINK_C_SHLIB="$CC" |
| 102 |
++ QMAKE_LINK="$CXX" |
| 103 |
++ QMAKE_LINK_SHLIB="$CXX" |
| 104 |
++ QMAKE_OBJCOPY="$OBJCOPY" |
| 105 |
++ QMAKE_RANLIB= |
| 106 |
++ QMAKE_STRIP= |
| 107 |
++ QMAKE_CC="$CC" |
| 108 |
++ QMAKE_CXX="$CXX" |
| 109 |
++ QMAKE_CFLAGS="$CFLAGS" |
| 110 |
++ QMAKE_CFLAGS_RELEASE= |
| 111 |
++ QMAKE_CFLAGS_DEBUG= |
| 112 |
++ QMAKE_CXXFLAGS="$CXXFLAGS" |
| 113 |
++ QMAKE_CXXFLAGS_RELEASE= |
| 114 |
++ QMAKE_CXXFLAGS_DEBUG= |
| 115 |
++ QMAKE_LFLAGS="$LDFLAGS" |
| 116 |
++ QMAKE_LFLAGS_RELEASE= |
| 117 |
++ QMAKE_LFLAGS_DEBUG= |
| 118 |
++ ) |
| 119 |
++fi |
| 120 |
++ |
| 121 |
++echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}" |
| 122 |
++$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}" |
| 123 |
+ |
| 124 |
+ cd $CURR_DIR |
| 125 |
+ echo "" |
| 126 |
|
| 127 |
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild |
| 128 |
index 8b43bc444d3..a23a11d67fb 100644 |
| 129 |
--- a/sci-electronics/klayout/klayout-9999.ebuild |
| 130 |
+++ b/sci-electronics/klayout/klayout-9999.ebuild |
| 131 |
@@ -35,14 +35,15 @@ RDEPEND=" |
| 132 |
" |
| 133 |
DEPEND="${RDEPEND}" |
| 134 |
|
| 135 |
-all_ruby_prepare() { |
| 136 |
- default |
| 137 |
-} |
| 138 |
+PATCHES=( |
| 139 |
+ "${FILESDIR}/${PN}-9999-expert.patch" |
| 140 |
+) |
| 141 |
|
| 142 |
each_ruby_configure() { |
| 143 |
tc-export CC CXX AR LD RANLIB |
| 144 |
export CFLAGS CXXFLAGS |
| 145 |
./build.sh \ |
| 146 |
+ -expert \ |
| 147 |
-dry-run \ |
| 148 |
-qmake /usr/lib64/qt5/bin/qmake \ |
| 149 |
-ruby "${RUBY}" \ |
Archives