Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el

Conflicts:
	extra/abiword/PKGBUILD

1 files changed, 2 insertions, 25 deletions

diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
index 209e94e59..996d0d980 100644
--- a/extra/abiword/PKGBUILD
+++ b/extra/abiword/PKGBUILD
@@ -20,31 +20,6 @@ conflicts=('abiword')
 replaces=('abiword')
 provides=("abiword=$pkgver")
 
-if [ "${CARCH}" = 'mips64el' ]; then
-    
-    ARCHFLAGS=""
-    for opt in ${CFLAGS}; do
-        case ${opt} in
-            -O?) ARCHFLAGS+="-O1 " ;;
-            *) ARCHFLAGS+="${opt} " ;;
-        esac
-    done
-    CFLAGS=${ARCHFLAGS}
-
-    ARCHFLAGS=""
-    for opt in ${CXXFLAGS}; do
-        case ${opt} in
-            -O?) ARCHFLAGS+="-O1 " ;;
-            *) ARCHFLAGS+="${opt} " ;;
-        esac
-    done
-    CXXFLAGS=${ARCHFLAGS}
-
-    unset ARCHFLAGS
-
-    echo CFLAGS  : ${CFLAGS}
-    echo CXXFLAGS: ${CXXFLAGS}
-fi
 
 # source PKGBUILD; mksource
 mksource() {
@@ -76,6 +51,8 @@ build() {
               --enable-plugins --without-gnomevfs --with-gio --with-goffice \
               --disable-static --with-psiconv-config=/nothere 
 
+
+  sed -ir 's/--no-undefined/-no-undefined/' src/Makefile
   make
 }