slis 14/07/24 05:48:35 Added: silo-4.9.1-qtlibs.patch silo-4.9.1-tests.patch Log: added silo package (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x55265D89)
Revision Changes Path 1.1 sci-libs/silo/files/silo-4.9.1-qtlibs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/silo/files/silo-4.9.1-qtlibs.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/silo/files/silo-4.9.1-qtlibs.patch?rev=1.1&content-type=text/plain Index: silo-4.9.1-qtlibs.patch =================================================================== diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure --- silo-4.9.1-old/configure 2014-01-18 23:19:15.755030306 +0100 +++ silo-4.9.1-new/configure 2014-01-18 23:20:52.595031159 +0100 @@ -27503,7 +27503,7 @@ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" fi - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" else # Use cached value or do search, starting with suggestions from # the command line @@ -27577,7 +27577,7 @@ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" fi - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" else # There is no valid definition for $QTDIR as Trolltech likes to see it ax_qt_dir= @@ -27589,7 +27589,7 @@ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" fi - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" else # Normally, when there is no traditional Trolltech installation, # the library is installed in a place where the linker finds it @@ -27607,7 +27607,7 @@ # See if we find the library without any special options. # Don't add top $LIBS permanently yet ax_save_LIBS="$LIBS" - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ax_qt_LIBS="$LIBS" ax_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" @@ -27668,7 +27668,7 @@ # That did not work. Try the multi-threaded version echo "Non-critical error, please neglect the above." >&5 ax_qt_lib=qt-mt - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27726,7 +27726,7 @@ # That did not work. Try the OpenGL version echo "Non-critical error, please neglect the above." >&5 ax_qt_lib=qt-gl - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27809,7 +27809,7 @@ fi done # Try with that one - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF 1.1 sci-libs/silo/files/silo-4.9.1-tests.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/silo/files/silo-4.9.1-tests.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/silo/files/silo-4.9.1-tests.patch?rev=1.1&content-type=text/plain Index: silo-4.9.1-tests.patch =================================================================== --- tests/Makefile.in.old 2014-07-24 07:25:53.464381420 +0200 +++ tests/Makefile.in 2014-07-24 07:26:14.951048323 +0200 @@ -169,7 +169,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@ rocket_silo_la_LIBADD = -am_rocket_silo_la_OBJECTS = rocket_silo.lo +am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsilo.la rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS) rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
