|
@@ -136,7 +136,7 @@ checkStatus() {
|
|
|
sayIfVerbal "configure or make of $PKG returned with non zero: $STATUS"
|
|
sayIfVerbal "configure or make of $PKG returned with non zero: $STATUS"
|
|
|
open $LOG_FILE
|
|
open $LOG_FILE
|
|
|
#printPreprocessor
|
|
#printPreprocessor
|
|
|
- /bin/bash ./finish.sh
|
|
|
|
|
|
|
+ #/bin/bash ./finish.sh
|
|
|
exit $STATUS
|
|
exit $STATUS
|
|
|
else
|
|
else
|
|
|
#echo "make returned with zero"
|
|
#echo "make returned with zero"
|
|
@@ -1398,11 +1398,13 @@ buildGcrypt() {
|
|
|
|
|
|
|
|
patchKSBA() {
|
|
patchKSBA() {
|
|
|
sed -i -- 's|#include <stdarg.h>|#include <stdarg.h>\n#include "ksba.h"\n|' src/asn1-gentables.c
|
|
sed -i -- 's|#include <stdarg.h>|#include <stdarg.h>\n#include "ksba.h"\n|' src/asn1-gentables.c
|
|
|
- sed -i -- "s|$(CC_FOR_BUILD) -I$(srcdir)|$(CC_FOR_BUILD) -I$(srcdir) -I$SKEL_PREFIX/$ROOT_PREFIX/include/|" src/Makefile.in
|
|
|
|
|
- sed -i -- 's|const char \*gpg_strerror|//const char \*gpg_strerror|' src/gen-help.h
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ FIND='$(CC_FOR_BUILD) -I$(srcdir)'
|
|
|
|
|
+ sed -i -- "s|$FIND |$FIND -I$SKEL_PREFIX/$ROOT_PREFIX/include |" src/Makefile.in
|
|
|
|
|
+ # sed -i -- "s|$(CC_FOR_BUILD) -I$(srcdir) |$(CC_FOR_BUILD) -I$(srcdir) -I$SKEL_PREFIX/$ROOT_PREFIX/include/ |" src/Makefile.in
|
|
|
|
|
+ sed -i -- 's|const char \*gpg_strerror|//const char \*gpg_strerror|' src/gen-help.h
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
- buildKSBA() {
|
|
|
|
|
|
|
+buildKSBA() {
|
|
|
PKG_NAME="libksba-1.3.5"
|
|
PKG_NAME="libksba-1.3.5"
|
|
|
checkBuilt $PKG_NAME
|
|
checkBuilt $PKG_NAME
|
|
|
if [[ $? != 0 ]]; then
|
|
if [[ $? != 0 ]]; then
|
|
@@ -1416,7 +1418,7 @@ patchKSBA() {
|
|
|
buildProduct $PKG_NAME "--with-libgpg-error-prefix=$SKEL_PREFIX/$ROOT_PREFIX/"
|
|
buildProduct $PKG_NAME "--with-libgpg-error-prefix=$SKEL_PREFIX/$ROOT_PREFIX/"
|
|
|
codesign "$SKEL_PREFIX/$ROOT_PREFIX/lib/libksba.8.dylib"
|
|
codesign "$SKEL_PREFIX/$ROOT_PREFIX/lib/libksba.8.dylib"
|
|
|
fi
|
|
fi
|
|
|
- }
|
|
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
patchNpth() {
|
|
patchNpth() {
|
|
|
if [[ "$PLATFORM" == "AppleTVOS" ]]; then
|
|
if [[ "$PLATFORM" == "AppleTVOS" ]]; then
|
|
@@ -1761,7 +1763,7 @@ mkdirIfNecessary $ALREADY_BUILT
|
|
|
# Ensure our SDK has all the required "extras" installed/setup
|
|
# Ensure our SDK has all the required "extras" installed/setup
|
|
|
prepSDK
|
|
prepSDK
|
|
|
|
|
|
|
|
-#buildBashAndFriends
|
|
|
|
|
|
|
+buildBashAndFriends
|
|
|
buildBasicUtils
|
|
buildBasicUtils
|
|
|
buildDPKGAndDependencies
|
|
buildDPKGAndDependencies
|
|
|
buildAPTAndDependencies
|
|
buildAPTAndDependencies
|