diff options
| -rw-r--r-- | debian/patches/dyson-config.patch | 74 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
2 files changed, 69 insertions, 7 deletions
diff --git a/debian/patches/dyson-config.patch b/debian/patches/dyson-config.patch index d74b000..6a610f0 100644 --- a/debian/patches/dyson-config.patch +++ b/debian/patches/dyson-config.patch @@ -1,12 +1,19 @@ Index: oss4/configure =================================================================== ---- oss4.orig/configure 2013-05-04 00:40:25.669842504 +0400 -+++ oss4/configure 2013-05-04 01:49:40.694319870 +0400 -@@ -201,28 +201,6 @@ +--- oss4.orig/configure 2013-05-04 20:44:57.750037915 +0400 ++++ oss4/configure 2013-05-04 23:08:56.152871980 +0400 +@@ -1,5 +1,7 @@ + #!/bin/sh ++eval `dpkg-architecture -s` ++ + CONFIGURE=YES + COPY_OPTIONS= + OSSLIBDIR="/usr/lib/oss" +@@ -202,26 +204,12 @@ case `uname` in --"SunOS") + "SunOS") - case `uname -r` in - "5.9") - echo Setting up for Solaris 9 @@ -27,7 +34,62 @@ Index: oss4/configure - esac - exec sh $SRCDIR/setup/SunOS/solsetup.sh - ;; -- ++ ISA="" ++ if [ "x$DEB_HOST_ARCH_CPU" = "xamd64" ]; then ++ ISA="-Aamd64 -K" ++ fi ++ exec sh $SRCDIR/setup/setupdir.sh $ISA ++ ;; + "Linux") - if test "$NOALSA" != "1" +Index: oss4/setup/SunOS/make.local +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ oss4/setup/SunOS/make.local 2013-05-04 22:28:36.972357104 +0400 +@@ -0,0 +1,21 @@ ++build: kernel/framework/include/buildid.h all ++ sh build.sh ++ ++copy: build ++ #rm -f ${OSSLIBDIR}/modules/*.o ++ (cd prototype; find -L . -type d | xargs -i{} mkdir -p ${DESTDIR}/{}) ++ (cd prototype; find -L . -type f | xargs -i{} cp {} ${DESTDIR}/{}) ++ ++package: build ++ sh setup/Linux/mkpkg.sh ++ ++tarball: build ++ sh setup/Linux/mktarball.sh ++ ++deb: build ++ sh setup/Linux/mkdeb.sh ++ ++install: copy ++ cd ${OSSLIBDIR}/build && sh install.sh ++ sync ++ soundoff && sync && soundon && echo "OSS has started OK" +Index: oss4/setup/srcconf_solaris.inc +=================================================================== +--- oss4.orig/setup/srcconf_solaris.inc 2013-05-04 20:44:57.749940723 +0400 ++++ oss4/setup/srcconf_solaris.inc 2013-05-04 22:28:36.974404091 +0400 +@@ -10,7 +10,7 @@ + * + */ + +-/*#define USE_GCC*/ ++#define USE_GCC + #define HAVE_SYSDEP + /* #define HAVE_KERNEL_FLAGS */ + #include <sys/systeminfo.h> +@@ -21,7 +21,9 @@ + + conf->flags |= F_USEARCH; + #ifdef USE_GCC +- strcpy (conf->ccomp, "gcc -Wall -O"); ++ strcpy (conf->ccomp, "gcc -Wall -O2"); ++ shlib_cflags = "-fPIC"; ++ shlib_ldflags = "-shared"; + #else + + # if 0 diff --git a/debian/patches/series b/debian/patches/series index 6c946f2..b0d08dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -dyson-config.patch cmd.patch os_cmd.patch txt2man.patch @@ -15,4 +14,5 @@ gcc-4.6.patch #generic_srccconf.patch kfreebsd-gnu.patch modules-i386.patch +dyson-config.patch |