Hi Michael. El vie, 12 ene 2024 a las 2:32, Michael Keller (<[email protected]>) escribió:
> > No problem, I can hold off on that until you let me know. > I've finally been able to build the image and works fine. Attached is the patch to apply taken from the github PR. I don't know too much about MXE's internals but the patch has passed all recommended tests from MXE site, downloads the correct tar file, correctly checks for version, and correctly checks file's checksum. BTW, I've noticed we are building the image with shared libraries for both triplets x86_64-w64-mingw32 and i686-w64-mingw32. But then we only use those from x86_64-w64-mingw32. i686-w64 binaries add approx. 3GB to the image and probably 1 hour to the build, depending on the machine, off course. Maybe @Dirk Hohndel <[email protected]> remember why these are built or maybe they are just a dangling blast from the past ;-). If it's the last case, I think they can be safely removed from the image build. Best regards. Salva.
# Temporary patch to apply to MXE's src/mdbtools.mk file while building docker # image, until it's applied upstream at github's MXE repo. diff --git a/src/mdbtools.mk b/src/mdbtools.mk index 42d303c2..d9d0f557 100644 --- a/src/mdbtools.mk +++ b/src/mdbtools.mk @@ -1,19 +1,17 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mdbtools -$(PKG)_WEBSITE := https://sourceforge.net/projects/mdbtools/ +$(PKG)_WEBSITE := https://github.com/mdbtools/mdbtools $(PKG)_IGNORE := -$(PKG)_VERSION := 0.7.1 -$(PKG)_CHECKSUM := 4eac1bce55066a38d9ea6c52a8e8ecc101b79afe75118ecc16852990472c4721 -$(PKG)_SUBDIR := brianb-mdbtools-f8ce1cc -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/brianb/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 1.0.0 +$(PKG)_CHECKSUM := 3446e1d71abdeb98d41e252777e67e1909b186496fda59f98f67032f7fbcd955 +$(PKG)_GH_CONF := mdbtools/mdbtools/releases, v $(PKG)_DEPS := cc glib define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/brianb/mdbtools/tags' | \ - grep '<a href="/brianb/mdbtools/archive/' | \ - $(SED) -n 's,.*href="/brianb/mdbtools/archive/\([0-9][^"_]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/mdbtools/mdbtools/tags' | \ + grep 'href="/mdbtools/mdbtools/archive/' | \ + $(SED) -n 's,.*href="/mdbtools/mdbtools/archive/refs/tags/v\([0-9][^"_]*\)\.tar.*,\1,p' | \ head -1 endef @@ -24,10 +22,11 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --disable-man \ + --without-bash-completion-dir \ --prefix='$(PREFIX)/$(TARGET)' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= || \ - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= + $(MAKE) CFLAGS+='-Wno-deprecated-declarations' -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= || \ + $(MAKE) CFLAGS+='-Wno-deprecated-declarations' -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= endef $(PKG)_BUILD_SHARED = -- 2.43.0
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
