Diff

Differences From Artifact [62d42d68c3]:

To Artifact [975f0987e4]:


    29     29       SRCURL="http://sourceforge.net/projects/next-scripting/files/${NSFVERS}/nsf${NSFVERS}.tar.gz/download"
    30     30       SRCHASH='dec695b908f286dda128b62be717a4248ebd31e7'
    31     31   fi
    32     32   
    33     33   BUILDDIR="$(pwd)/build/nsf${NSFVERS}"
    34     34   OUTDIR="$(pwd)/out"
    35     35   INSTDIR="$(pwd)/inst"
    36         -export NSFVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
           36  +PATCHDIR="$(pwd)/patches"
           37  +export NSFVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    37     38   
    38     39   # Set configure options for this sub-project
    39     40   LDFLAGS="${LDFLAGS} ${KC_NSF_LDFLAGS}"
    40     41   CFLAGS="${CFLAGS} ${KC_NSF_CFLAGS}"
    41     42   CPPFLAGS="${CPPFLAGS} ${KC_NSF_CPPFLAGS}"
    42     43   LIBS="${LIBS} ${KC_NSF_LIBS}"
    43     44   export LDFLAGS CFLAGS CPPFLAGS LIBS
................................................................................
    70     71   
    71     72       if [ "${use_git}" = "1" ]; then
    72     73   	## the GIT zip tarball does not preserve file permissions (configure)
    73     74   	rm -rf configure
    74     75   	autoconf || exit 1
    75     76       fi
    76     77   
           78  +    # Apply patches if needed
           79  +    for patch in "${PATCHDIR}/all"/nsf-${NSFVERS}-*.diff "${PATCHDIR}/all"/nsf-all-*.diff "${PATCHDIR}/${NSFVERS}"/nsf-${NSFVERS}-*.diff; do
           80  +	if [ ! -f "${patch}" ]; then
           81  +	    continue
           82  +	fi
           83  +        
           84  +	echo "Applying: ${patch}"
           85  +	${PATCH:-patch} -p1 < "${patch}"
           86  +    done
    77     87   
    78     88       # There's a STATIC<packageInAllUpperCase>=-1,0,1
    79     89       # ... where -1 means no (i.e., shared),
    80     90       # ... 0 means try not to (try shared first, if that
    81     91       # 	  doesn't work do static),
    82     92       # ... and 1 means try to (try only static)
    83     93