diff options
| author | Ethan Grammatikidis | 2009-06-05 17:40:47 +0100 |
|---|---|---|
| committer | Ethan Grammatikidis | 2009-06-05 17:40:47 +0100 |
| commit | 9b2c5cafc96c098d48f02779ea4eb41b2e1a8ffd (patch) | |
| tree | a4b3a0f6a6e6adf677d4079434348015322fea10 /audio-drivers/oss | |
| parent | 2f40f21b9a749a4629c385199f0474c2752c3ea6 (diff) | |
oss: removed broken patch, added sed script
Diffstat (limited to 'audio-drivers/oss')
| -rw-r--r-- | audio-drivers/oss/HISTORY | 4 | ||||
| -rwxr-xr-x | audio-drivers/oss/PRE_BUILD | 4 | ||||
| -rw-r--r-- | audio-drivers/oss/nowerror.patch | 33 |
3 files changed, 7 insertions, 34 deletions
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY index d7dafce9e0..81a289f670 100644 --- a/audio-drivers/oss/HISTORY +++ b/audio-drivers/oss/HISTORY @@ -1,3 +1,7 @@ +2009-06-05 Ethan Grammatikidis <eekee57@fastmail.fm> + * PRE_BUILD: changed patch to sed script + * nowerror.patch: removed + 2009-03-01 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS: updated OSS_BRANCH=stable to v4.1-build1051 * DEPENDS: missing bc as dependency diff --git a/audio-drivers/oss/PRE_BUILD b/audio-drivers/oss/PRE_BUILD index e5efc6a2bd..a556d2e626 100755 --- a/audio-drivers/oss/PRE_BUILD +++ b/audio-drivers/oss/PRE_BUILD @@ -2,6 +2,8 @@ default_pre_build && mk_source_dir $SOURCE_DIRECTORY.bld && cd $SOURCE_DIRECTORY && if [[ $OSS_BRANCH != stable ]]; then -patch -p0 < $SPELL_DIRECTORY/nowerror.patch + sed -i 's/-Werror//' \ + setup/Linux/oss/build/install.sh \ + setup/srcconf_linux.inc fi diff --git a/audio-drivers/oss/nowerror.patch b/audio-drivers/oss/nowerror.patch deleted file mode 100644 index 80a7a65acb..0000000000 --- a/audio-drivers/oss/nowerror.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nuar setup.orig/Linux/oss/build/install.sh setup/Linux/oss/build/install.sh ---- setup.orig/Linux/oss/build/install.sh 2008-11-20 07:57:50.000000000 +0100 -+++ setup/Linux/oss/build/install.sh 2008-11-20 07:58:50.000000000 +0100 -@@ -336,7 +336,7 @@ - - # Recompile libflashsupport.so if possible. Otherwise use the precompiled - # version. --(cd $OSSLIBDIR/lib;gcc -m32 -shared -fPIC -O2 -Wall -Werror flashsupport.c -o $OSSLIBDIR/lib/libflashsupport.so) > /dev/null 2>&1 -+(cd $OSSLIBDIR/lib;gcc -m32 -shared -fPIC -O2 -Wall flashsupport.c -o $OSSLIBDIR/lib/libflashsupport.so) > /dev/null 2>&1 - - if test ! -f $OSSLIBDIR/etc/userdefs - then -diff -Nuar setup.orig/srcconf_linux.inc setup/srcconf_linux.inc ---- setup.orig/srcconf_linux.inc 2008-11-20 07:57:50.000000000 +0100 -+++ setup/srcconf_linux.inc 2008-11-20 07:58:11.000000000 +0100 -@@ -26,7 +26,7 @@ - if (system(cmd)==0) - { - if (do_warning_checks) -- strcpy(conf->OSflags, "-fno-common -fno-stack-protector -Wall -Werror"); -+ strcpy(conf->OSflags, "-fno-common -fno-stack-protector -Wall"); - else - strcpy(conf->OSflags, "-fno-common -fno-stack-protector"); - unlink("srcconf.o"); -@@ -34,7 +34,7 @@ - else - { - if (do_warning_checks) -- strcpy(conf->OSflags, "-fno-common -Wall -Werror"); -+ strcpy(conf->OSflags, "-fno-common -Wall"); - else - strcpy(conf->OSflags, "-fno-common"); - } |