From 7ed84036e5c4c2907e6f9a917f1941102d74003f Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 08:37:48 +0000 Subject: [PATCH 01/14] scripts/Windows/README.adoc: added note about script execution. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index a1da002cc1..e38608f873 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -177,6 +177,12 @@ NOTE: Instructions below use `sudo` to specify operations you may need to run with privilege elevation (assuming installation into a `PREFIX=/usr/$ARCH`); the majority of operations can be done (recommended) as an unprivileged user. +NOTE: The instrunctions reported below can be saved as shell sctipts and execued with the following command (otherwise the change directory commands are not permanent): + +------ +. ./scriptname.sh +------ + pthread library ^^^^^^^^^^^^^^^ From 816d81d0b49bced750e1b9af950840297512bf33 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 08:40:14 +0000 Subject: [PATCH 02/14] scripts/Windows/README.adoc: corrected example. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index e38608f873..d5ef7d533a 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -177,8 +177,8 @@ NOTE: Instructions below use `sudo` to specify operations you may need to run with privilege elevation (assuming installation into a `PREFIX=/usr/$ARCH`); the majority of operations can be done (recommended) as an unprivileged user. -NOTE: The instrunctions reported below can be saved as shell sctipts and execued with the following command (otherwise the change directory commands are not permanent): - +NOTE: The instrunctions reported below can be saved as shell sctipts and execued +with the following command (otherwise the change directory commands are not permanent): ------ . ./scriptname.sh ------ From 2e9c6813361cee9793a51bd77e2829cc2f8c89a7 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 08:41:48 +0000 Subject: [PATCH 03/14] scripts/Windows/README.adoc: corrected example Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index d5ef7d533a..4ae8110d03 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -179,9 +179,7 @@ the majority of operations can be done (recommended) as an unprivileged user. NOTE: The instrunctions reported below can be saved as shell sctipts and execued with the following command (otherwise the change directory commands are not permanent): ------- -. ./scriptname.sh ------- +`. ./scriptname.sh` pthread library ^^^^^^^^^^^^^^^ From 646bf72e9fa22bed71f5ee734015d8f062f2ef48 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 08:51:36 +0000 Subject: [PATCH 04/14] scripts/Windows/README.adoc: corrected instructions of pthread installation Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index 4ae8110d03..eed297b36b 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -226,9 +226,12 @@ presumed inconsequential. You can try a not-"inlined" build instead. Finally, install the resulting files into locations under `PREFIX`: - :; sudo cp *.dll ${PREFIX}/pthreads/lib/ - :; sudo cp *.a ${PREFIX}/lib/ - :; sudo cp pthread.h sched.h semaphore.h ${PREFIX}/pthreads/include + :; sudo mkdir -p $PREFIX/pthreads/lib/ + :; sudo cp *.dll $PREFIX/pthreads/lib/ + :; sudo mkdir -p $PREFIX/lib/ + :; sudo cp *.a $PREFIX/lib/ + :; sudo mkdir -p $PREFIX/pthreads/include/ + :; sudo cp pthread.h sched.h semaphore.h $PREFIX/pthreads/include MinGW regex library From 1d91998d5440429f38476a7fb11a52f23e26aed5 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:48:10 +0000 Subject: [PATCH 05/14] scripts/Windows/README.adoc: added export of PREFIX bin directory. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index eed297b36b..ef5cbda2df 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -284,6 +284,15 @@ libusb :; make :; sudo make install +[NOTE] +====== +If it complains about +`libtoolize or glibtoolize was not found! Please install libtool.` +please edit export the bin folder under PREFIX path: + + :; export PATH=$PREFIX/bin:$PATH + +====== zlib ^^^^ From f461af2fd4af3cac9d7c3d405e33c4763f295091 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:08:55 +0000 Subject: [PATCH 06/14] scripts/Windows/README.adoc: Added pkgconf installation Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index ef5cbda2df..db9e0967d4 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -288,12 +288,23 @@ libusb ====== If it complains about `libtoolize or glibtoolize was not found! Please install libtool.` -please edit export the bin folder under PREFIX path: +please export the bin folder under PREFIX path: :; export PATH=$PREFIX/bin:$PATH ====== +[NOTE] +====== +If it complains about +`syntax error near unexpected toket 'LIBUSB_1_0,' + 'PKG_CHECK_MODULES(LIBUSB_1_0, libusb-1.0 >= 0.9.1)'` +please install pkgconf: + + :; sudo apt-get install pkgconf + +====== + zlib ^^^^ From a484df4f7eb5d5131e0c2253127f0fd43cec8353 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:41:02 +0000 Subject: [PATCH 07/14] scripts/Windows/README.adoc: Fixed libusbcompat script. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index db9e0967d4..f9fc328d80 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -279,6 +279,8 @@ libusb :; cd "$WSDIR" :; unzip "$DLDIR"/libusb-compat-0.1-master.zip :; cd libusb-compat-0.1-master + :; export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig + :; export PATH=$PREFIX/bin/:$PATH :; ./bootstrap.sh :; ./configure --prefix="$PREFIX" $HOST_FLAG :; make From dae3b0dc84b7b7a897c35f19898144a68734a397 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:16:49 +0000 Subject: [PATCH 08/14] scripts/Windows/README.adoc: Fixed libxml2 script. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index f9fc328d80..abb2fcb283 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -404,6 +404,10 @@ Needed for libneon. :; cd "$WSDIR" :; tar xzf "$DLDIR"/libxml2-v2.9.14.tar.gz :; cd libxml2-v2.9.14 + :; libtoolize + :; aclocal + :; autoheader + :; autoupdate :; ./autogen.sh --prefix="$PREFIX" $HOST_FLAG --without-python :; make :; sudo make install From 6b72c0dcc2e7d17f05f07ba99d4e19fae0a4073d Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:36:11 +0000 Subject: [PATCH 09/14] scripts/Windows/README.adoc: added note for freetype library Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index abb2fcb283..ebdb467795 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -457,6 +457,10 @@ and/or of the system antivirus interaction?.. :; make :; sudo make install +[NOTE] +====== +If the build is failing on VirtualBox VM please make sure to have installed the VirtualBox Guest Additions. +====== ///////////////////////////////////////////////////////////////////////////// WIP - fontconfig not usable yet due to ICU failing to cross-build From ab0b2b4861dfac5faf0266f2bab10d06caf89853 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:50:33 +0000 Subject: [PATCH 10/14] scripts/Windows/README.adoc: Removed note about PATH since the export command has been put into the script Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index ebdb467795..61e598e5b6 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -286,16 +286,6 @@ libusb :; make :; sudo make install -[NOTE] -====== -If it complains about -`libtoolize or glibtoolize was not found! Please install libtool.` -please export the bin folder under PREFIX path: - - :; export PATH=$PREFIX/bin:$PATH - -====== - [NOTE] ====== If it complains about From d0de0c095bfb39a2b0dd2428c2f135898d84e3e3 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:52:46 +0000 Subject: [PATCH 11/14] scripts/Windows/README.adoc: Fixed libgd script. --- scripts/Windows/README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index 61e598e5b6..63fcf915d2 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -532,6 +532,7 @@ such context, this must be something about STDCALL and/or "extern C"... :; cd "$WSDIR" :; tar xzf "$DLDIR"/libgd-2.3.3.tar.gz :; cd libgd-2.3.3 + :; export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig :; ./configure --prefix="$PREFIX" $HOST_FLAG \ --with-png --with-freetype \ --without-tiff --without-jpeg --without-xpm \ From 725a4056affdb80db1691faac8931c073a066d23 Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Fri, 20 Dec 2024 19:04:54 +0000 Subject: [PATCH 12/14] scripts/Windows/README.adoc: Fixed libneon script. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index 63fcf915d2..5f5969b7c3 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -609,16 +609,14 @@ the Makefiles for current `install` target definition to run its job without `install-docs` part (example posted below). #:; ( cd "$DLDIR" && git clone -b fix-mingw-cross https://github.com/jimklimov/neon neon-git ) - :; ( cd "$DLDIR" && git clone https://github.com/notroj/neon neon-git ) - :; ( cd "$DLDIR/neon-git" && ./autogen.sh ) :; cd "$WSDIR" - :; rm -rf neon-git ; mkdir neon-git - :; cd neon-git - :; "$DLDIR"/neon-git/configure --prefix="$PREFIX" $HOST_FLAG \ - --enable-shared --with-ssl=openssl + :; git clone https://github.com/notroj/neon + :; cd "$WSDIR/neon" + :; export PATH=$PREFIX/bin:$PATH + :; ./autogen.sh + :; ./configure --prefix="$PREFIX" $HOST_FLAG --enable-shared --with-ssl=openssl :; make all docs - :; sudo make install \ - || sudo make install-lib install-headers install-config install-nls ###install-docs + :; sudo make install || sudo make install-lib install-headers install-config install-nls ###install-docs ///////////////////////////////////////////////////////////////////////////// From 5d08e8493c4dc3eb65f8f774015d190491089daf Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Fri, 20 Dec 2024 21:55:20 +0000 Subject: [PATCH 13/14] scripts/Windows/README.adoc: fixed build command. Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index 5f5969b7c3..e9c31d23c5 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -770,11 +770,11 @@ or, depending on the build environment(s) you have prepared, This is also automated for common NUT CI build script, calling it like this: ------ # Try to guess bitness based on ARCH or CFLAGS: -BUILD_TYPE=cross-windows-mingw ./ci_build.sh +BUILD_TYPE=cross-windows-mingw ./ci_build.sh --prefix=$PREFIX $HOST_FLAG # Or specifically: -BUILD_TYPE=cross-windows-mingw-32 ./ci_build.sh -BUILD_TYPE=cross-windows-mingw-64 ./ci_build.sh +BUILD_TYPE=cross-windows-mingw-32 ./ci_build.sh --prefix=$PREFIX $HOST_FLAG +BUILD_TYPE=cross-windows-mingw-64 ./ci_build.sh --prefix=$PREFIX $HOST_FLAG ------ ====== From fd0dfd5e3e2985ffe9a8dcd8e60b84c20fe2a0ed Mon Sep 17 00:00:00 2001 From: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> Date: Mon, 23 Dec 2024 14:51:51 +0000 Subject: [PATCH 14/14] scripts/Windows/README.adoc: Fixed spellcheck error on 'VirtualBox' Signed-off-by: RikyPlaza <158032745+RikyPlaza@users.noreply.github.com> --- scripts/Windows/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Windows/README.adoc b/scripts/Windows/README.adoc index e9c31d23c5..44c456cab0 100644 --- a/scripts/Windows/README.adoc +++ b/scripts/Windows/README.adoc @@ -449,7 +449,7 @@ and/or of the system antivirus interaction?.. [NOTE] ====== -If the build is failing on VirtualBox VM please make sure to have installed the VirtualBox Guest Additions. +If the build is failing on Virtual Box VM please make sure to have installed the Virtual Box Guest Additions. ====== /////////////////////////////////////////////////////////////////////////////