Skip to content

Commit

Permalink
Update patches and enable gnulib tool on all
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchcapper committed Nov 29, 2024
1 parent 127ba08 commit af78794
Show file tree
Hide file tree
Showing 9 changed files with 740 additions and 8,011 deletions.
6 changes: 5 additions & 1 deletion build/f_libpsl_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1
#BLD_CONFIG_BUILD_DEBUG=1
BLD_CONFIG_GNU_LIBS_USED=0
BLD_CONFIG_GNU_LIBS_BUILD_AUX_ONLY_USED=1
BLD_CONFIG_GNU_LIBS_AUTORECONF_WRAPPER=0

function ourmain() {
startcommon;
Expand Down Expand Up @@ -66,7 +67,10 @@ fi
echo "EXTRA_DIST =" >gtk-doc.make
echo "CLEANFILES =" >>gtk-doc.make
GTKDOCIZE=""
autoreconf --symlink --verbose --install #we don't want to use their autogen.sh script it doesnt fail out properly and has no benefits but may needs to pull extra cmds they add to it in future
# BEWARE OF https://ae1020.github.io/undefined-macro-pkg-config/ incase of macro errors
autoreconf --symlink --verbose --install || autoreconf --symlink --verbose --install #we don't want to use their autogen.sh script it doesnt fail out properly and has no benefits but may needs to pull extra cmds they add to it in future, we do need to run this twice though t oavoid error

#./autogen.sh
SKIP_STEP=""
fi

Expand Down
6 changes: 3 additions & 3 deletions build/f_pcre2_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ set -e
. "${WLB_SCRIPT_FOLDER:-$(dirname "$(readlink -f "$BASH_SOURCE")")}/helpers.sh"

BLD_CONFIG_BUILD_NAME="pcre2";
BLD_CONFIG_CONFIG_CMD_ADDL=""
BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1
BLD_CONFIG_CONFIG_CMD_ADDL="";
BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1;
#BLD_CONFIG_BUILD_DEBUG=1
BLD_CONFIG_GNU_LIBS_USED=0;
BLD_CONFIG_CMAKE_STYLE="best"
BLD_CONFIG_CMAKE_STYLE="best";
function ourmain() {
startcommon;

Expand Down
2 changes: 1 addition & 1 deletion build/f_sed_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
BLD_CONFIG_BUILD_NAME="sed";
BLD_CONFIG_CONFIG_CMD_ADDL="" #--disable-nls --enable-static
BLD_CONFIG_GNU_LIBS_ADDL=( "getopt-gnu" )
BLD_CONFIG_GNU_LIBS_USE_GNULIB_TOOL_PY=0
#BLD_CONFIG_GNU_LIBS_USE_GNULIB_TOOL_PY=0
#BLD_CONFIG_BUILD_DEBUG=1

BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1
Expand Down
2 changes: 1 addition & 1 deletion build/f_wget_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BLD_CONFIG_CONFIG_CMD_ADDL=("--with-ssl=openssl") #--disable-nls
BLD_CONFIG_ADD_WIN_ARGV_LIB=1
BLD_CONFIG_GNU_LIBS_ADDL=( "pathmax" "ftruncate" "fnmatch-gnu" "fnmatch-h" "xstrndup" )
BLD_CONFIG_GNU_LIBS_USE_GNULIB_TOOL_PY_ADDL_MK_FILES_FIX=( "lib/gnulib.mk" )
BLD_CONFIG_GNU_LIBS_USE_GNULIB_TOOL_PY=0
#BLD_CONFIG_GNU_LIBS_USE_GNULIB_TOOL_PY=0
#BLD_CONFIG_BUILD_DEBUG=1
BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1

Expand Down
1 change: 1 addition & 0 deletions msys_shell.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ $ErrorActionPreference = "Stop";
$env:MSYS="winsymlinks:native wincmdln"
#$env:MSYS2_ARG_CONV_EXCL="/a;/b;/c;/d;/e;/f;/g;/h;/i;/j;/k;/l;/m;/n;/o;/p;/q;/r;/s;/u;/v;/w;/x;/y;/z;/0;/1;/2;/3;/4;/5;/6;/7;/8;/9;/A;/B;/C;/D;/E;/F;/G;/H;/I;/J;/K;/L;/M;/N;/O;/P;/Q;/R;/S;/T;/U;/V;/W;/X;/Y;/Z"
$env:MSYS2_ARG_CONV_EXCL="*"
$env:LIBTOOL_MSYS_NO_C_DOUBLE_ESCAPE="1"
if ($env:WLB_BASE_FOLDER){
cd $env:WLB_BASE_FOLDER;
}
Expand Down
Loading

0 comments on commit af78794

Please sign in to comment.