Ticket #15268: ncurses-5.9.p2.diff

File ncurses-5.9.p2.diff, 2.6 KB (added by jpflori, 8 years ago)

Spkg diff, for review only.

  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    4242
    4343== Special Update/Build Instructions ==
    4444
    45 None
     45=== Patches ===
     46
     47 * osx_gcc_flags.patch: Pass -no-cpp-precomp to GCC on OS X.
     48
     49 * SPARC_fix.patch: Don't mess with _XOPEN_SOURCE on Solaris.
     50
     51 * xopen_source_extended.patch: Only define _XOPEN_SOURCE_EXTENDED for
     52   C compiler.
     53
    4654
    4755== Changelog ==
    4856
     57=== ncurses-5.9.p2 (Jean-Pierre Flori, 4 November 2013) ===
     58 * #15268: Let ncurses build on Solaris.
     59 * Build without ADA support.
     60
    4961=== ncurses-5.9.p1 (Volker Braun, 22 Aug 2013) ===
    5062 * Build narrow and wide versions (#15080)
    5163
  • new file patches/xopen_source_extended.patch

    diff --git a/patches/xopen_source_extended.patch b/patches/xopen_source_extended.patch
    new file mode 100644
    - +  
     1diff -druN src.orig/configure src/configure
     2--- src.orig/configure  2011-04-01 01:35:51.000000000 +0200
     3+++ src/configure       2013-11-04 11:19:23.771479564 +0100
     4@@ -7864,7 +7864,7 @@
     5 echo "${ECHO_T}$cf_result" >&6
     6 
     7 if test "$cf_result" = yes ; then
     8-       CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
     9+       CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
     10 elif test "x" != "x" ; then
     11        echo "$as_me:7869: checking checking for compatible value versus " >&5
     12 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
     13@@ -7907,7 +7907,7 @@
     14 echo "${ECHO_T}$cf_result" >&6
     15        if test "$cf_result" = no ; then
     16                # perhaps we can override it - try...
     17-               CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED="
     18+               CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED="
     19        fi
     20 fi
     21 
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    a b  
    66    exit 1
    77fi
    88
    9 if [ -z $CFLAG64 ]; then 
     9if [ -z $CFLAG64 ]; then
    1010    CFLAG64=-m64
    11 fi 
     11fi
    1212
    1313# Compile for 64-bit if SAGE64 is set to 'yes':
    1414if [ $SAGE64 = yes ]; then
     
    2121
    2222DEBUG_CONFIGURE_FLAG=''
    2323if [ $SAGE_DEBUG = yes ]; then
     24    CFLAGS="-O0 -g $CFLAGS"
    2425    DEBUG_CONFIGURE_FLAG='--with-debug'
    2526else
    2627    DEBUG_CONFIGURE_FLAG='--without-debug'
     
    4243
    4344echo "Applying patches to upstream source..."
    4445for patch in ../patches/*.patch; do
     46    [ -r "$patch" ] || continue
    4547    patch -p1 <"$patch"
    4648    if [ $? -ne 0 ]; then
    4749        echo >&2 "Error applying '$patch'."
     
    6668    --with-termlib \
    6769    --with-shared \
    6870    --without-normal \
     71    --without-ada \
    6972    --disable-rpath-hack \
    7073    --enable-overwrite \
    7174    "$DEBUG_CONFIGURE_FLAG"
     
    103106    --with-shared \
    104107    --enable-widec \
    105108    --without-normal \
     109    --without-ada \
    106110    --disable-rpath-hack \
    107111    --enable-overwrite \
    108112    "$DEBUG_CONFIGURE_FLAG"