We really need to compile ncurses with -marm.

git-svn-id: http://svn.telesphoreo.org/trunk@812 514c082c-b64e-11dc-b46d-3d985efe055d

2 files changed, 9 insertions, 7 deletions

diff --git a/data/ncurses/make.sh b/data/ncurses/make.sh
index 88ca3622f..1c3d79359 100644
--- a/data/ncurses/make.sh
+++ b/data/ncurses/make.sh
@@ -5,12 +5,12 @@ dir=$(echo *)
 mkdir bld-ncurses{,w}
 cd bld-ncurses
 flags='--with-shared --without-normal --without-debug --enable-sigwinch --disable-mixed-case --enable-termcap'
-PKG_CONF=../${dir}/configure pkg:configure ${flags}
-make #CFLAGS='-O2 -mthumb'
+PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags}
+make
 pkg:install
 cd ../bld-ncursesw
-PKG_CONF=../${dir}/configure pkg:configure ${flags} --disable-overwrite --enable-widec
-make #CFLAGS='-O2 -mthumb'
+PKG_CONF=../${dir}/configure PKG_MCPU=-marm pkg:configure ${flags} --disable-overwrite --enable-widec
+make
 pkg:install
 
 pkg: mkdir -p @/usr/lib
@@ -19,7 +19,7 @@ pkg: cp -aL /usr/lib/libncurses.dylib @/usr/lib/libncurses.dylib
 
 pkg: mkdir -p /usr/lib/_ncurses
 pkg: mv /usr/lib/lib{,n}curses.dylib /usr/lib/_ncurses/
-pkg: rm -f /usr/lib/*.a
+rm -f "${PKG_DEST}"/usr/lib/*.a
 
 for ti in "${PKG_DEST}"/usr/share/terminfo/*/*; do
     if [[ ${ti} == */@(?(pc)ansi|cons25|cygwin|dumb|linux|mach|rxvt|screen|sun|vt@(52|100|102|220)|swvt25?(m)|[Exe]term|putty|konsole|gnome|apple|Apple_Terminal|unknown)?([-+.]*) ]]; then
diff --git a/make.sh b/make.sh
index 50d251b6e..914bc278b 100755
--- a/make.sh
+++ b/make.sh
@@ -103,6 +103,7 @@ function pkg:autoconf() {
 export -f pkg:autoconf
 
 export PKG_CONF=./configure
+export PKG_MCPU=-mthumb
 
 function pkg:libtool_() {
     for ltmain in $(find -name "$1"); do
@@ -129,7 +130,8 @@ function pkg:configure() {
         --enable-shared=yes \
         --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix") \
         --localstatedir="/var/cache/${PKG_NAME}" \
-        CFLAGS='-O2 -mthumb -fno-common' \
+        CFLAGS="-O2 ${PKG_MCPU} -fno-common" \
+        CXXFLAGS="-O2 ${PKG_MCPU} -fno-common" \
         "$@")
     echo "${cfg[@]}"
     PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
@@ -139,7 +141,7 @@ function pkg:configure() {
 export -f pkg:configure
 
 function pkg:make() {
-    make CC="${PKG_TARG}-gcc" AR="${PKG_TARG}-ar" CXXFLAGS='-O2 -mthumb' "$@"
+    make CC="${PKG_TARG}-gcc" CXX="${PKG_TARG}-g++" AR="${PKG_TARG}-ar" "$@"
 }
 
 export -f pkg:make