diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1.recipe b/sci-visualization/gnuplot/gnuplot-5.0.1.recipe index df455ef3b..b99898e52 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.1.recipe +++ b/sci-visualization/gnuplot/gnuplot-5.0.1.recipe @@ -8,56 +8,62 @@ COPYRIGHT="1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley" LICENSE="Gnuplot" SOURCE_URI="http://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz" CHECKSUM_SHA256="7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47" -REVISION="1" +REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="!x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - gnuplot$secondaryArchSuffix = $portVersion - cmd:gnuplot$secondaryArchSuffix = $portVersion - " + gnuplot$secondaryArchSuffix = $portVersion + cmd:gnuplot$secondaryArchSuffix = $portVersion + " REQUIRES=" - haiku${secondaryArchSuffix} - #libqt4$secondaryArchSuffix - " + haiku${secondaryArchSuffix} + lib:libqt5$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - #libqt4${secondaryArchSuffix}_devel - " + haiku${secondaryArchSuffix}_devel + devel:libcairo$secondaryArchSuffix +# devel:libcerf$secondaryArchSuffix + devel:libGL$secondaryArchSuffix +# devel:libpango_1.0$secondaryArchSuffix + devel:libqt5$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:automake - cmd:autoconf - cmd:awk - cmd:cmp - cmd:gcc$secondaryArchSuffx - cmd:make - cmd:pkg_config$secondaryArchSuffix - " + cmd:aclocal + cmd:automake + cmd:autoconf + cmd:awk + cmd:cmp + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " PATCH() { - # remove hardcoded libm - sed -i 's/-lm/$(LIBS)/g' src/Makefile.am + sed -i 's/-lm/$(LIBS)/g' src/Makefile.am + sed -i 's/-rdynamic/-Wl,-export-dynamic/g' demo/plugin/Makefile.am + sed -i 's/isnan/std::isnan/g' src/qtterminal/qt_conversion.cpp } BUILD() { - #TODO: add Qt4 support (needs gcc4) - - aclocal - automake - - # work around for a gcc4 bug (output_operand_lossage) - export CFLAGS=-O3 - - runConfigure ./configure --without-cairo - make $jobArgs + aclocal + automake + runConfigure ./configure --without-cairo --with-qt + make $jobArgs } INSTALL() { - make install + make install-strip }