Hi,
a couple of packages such as QT and Amarok have a dependency to
SUNWmysql5. The OpenSolaris repository already contains MySQL 5.1
(SUNWmysql51) so I guess the spec and include files should be updated:
diff -r bcf4dba42d93 specs/base-specs/base-qt.spec
--- a/specs/base-specs/base-qt.spec Fri Sep 04 02:45:19 2009 +0200
+++ b/specs/base-specs/base-qt.spec Fri Sep 04 10:40:15 2009 +0200
@@ -125,7 +125,7 @@
-no-rpath \
-reduce-relocations \
-opengl desktop \
- -L/usr/mysql/5.0/lib/mysql \
+ -L/usr/mysql/5.1/lib/mysql \
-L/opt/foss/lib \
-platform solaris-cc \
-shared \
@@ -138,7 +138,7 @@
-I/usr/include/pgsql \
-I/usr/include/pgsql/server \
-I/opt/foss/include \
- -I/usr/mysql/5.0/include/mysql \
+ -I/usr/mysql/5.1/include/mysql \
%extra_includes \
%extra_libs \
-nomake demos \
diff -r bcf4dba42d93 specs/include/foss-depend-packages.inc
--- a/specs/include/foss-depend-packages.inc Fri Sep 04 02:45:19 2009
+0200
+++ b/specs/include/foss-depend-packages.inc Fri Sep 04 10:40:15 2009
+0200
@@ -174,7 +174,7 @@
#
# MySQL: S10 has mysql4 and Nevada + Indiana have mysql5
#
-%define depend_mysql SUNWmysql5u
+%define depend_mysql SUNWmysql51u
%if %is_s10
%define depend_mysql SUNWmysqlu
%endif
@@ -304,7 +304,7 @@
%if %{?_with_osol:1}
# You need to pkg install SUNWmysql5, but the SysV package is 5u
-%define depend_mysql SUNWmysql5u
+%define depend_mysql SUNWmysql51u
# You could get readline from the dev repo, if you really wanted.
# TODO: on next OSOL update, remove the check.
%if %(pkg info SUNWgnu-readline > /dev/null 2> /dev/null && echo 1 ||
echo 0)
diff -r bcf4dba42d93 specs/patches/amarok-findmysql.diff
--- a/specs/patches/amarok-findmysql.diff Fri Sep 04 02:45:19 2009
+0200
+++ b/specs/patches/amarok-findmysql.diff Fri Sep 04 10:40:15 2009
+0200
@@ -4,7 +4,7 @@
find_path(MYSQL_INCLUDE_DIR mysql.h
-+ /usr/mysql/5.0/include/mysql
++ /usr/mysql/5.1/include/mysql
+ /opt/mysql/mysql/include
+ /usr/mysql/include/mysql
~/usr/include/mysql
@@ -14,7 +14,7 @@
find_library(MYSQL_LIBRARIES NAMES mysqlclient
PATHS
-+ /usr/mysql/5.0/lib/mysql
++ /usr/mysql/5.1/lib/mysql
+ /opt/mysql/mysql/lib
+ /usr/mysql/lib/mysql
~/usr/lib/mysql
@@ -24,7 +24,7 @@
find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld
PATHS
-+ /usr/mysql/5.0/lib/mysql
++ /usr/mysql/5.1/lib/mysql
~/usr/lib/mysql
/opt/local/lib/mysql5/mysql
/opt/mysqle/lib/mysql
diff -r bcf4dba42d93 specs/tools/vbox/install-deps
--- a/specs/tools/vbox/install-deps Fri Sep 04 02:45:19 2009 +0200
+++ b/specs/tools/vbox/install-deps Fri Sep 04 10:40:15 2009 +0200
@@ -100,7 +100,7 @@
SUNWlibtool \
SUNWltdl \
SUNWmercurial \
- SUNWmysql5 \
+ SUNWmysql51 \
SUNWncurses \
SUNWopenexr \
SUNWperl-xml-parser \
Finally a short patch for stdcxx to make use of parallel builds on
corresponding machines:
diff -r bcf4dba42d93 specs/base-specs/base-stdcxx.spec
--- a/specs/base-specs/base-stdcxx.spec Fri Sep 04 02:45:19 2009 +0200
+++ b/specs/base-specs/base-stdcxx.spec Fri Sep 04 10:40:15 2009 +0200
@@ -278,7 +278,7 @@
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
# We half-expect the locale tools to fail in linking, so
# if that happens (re)build some more.
-$MAKE
+$MAKE $MAKE_CPUS
# Still some missing symlinks for the library.
(
cd build/lib
Regards
Thorsten
