diff --git a/src/libpaper-1-fixes.patch b/src/libpaper-1-fixes.patch new file mode 100644 index 00000000..b035b21c --- /dev/null +++ b/src/libpaper-1-fixes.patch @@ -0,0 +1,23 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Fri, 25 May 2018 01:21:03 +0200 +Subject: [PATCH 1/1] enable DLL builds + + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 1111111..2222222 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,7 +1,7 @@ + + lib_LTLIBRARIES = libpaper.la + libpaper_la_SOURCES = dimen.c paper.c dimen.h paperspecs.h +-libpaper_la_LDFLAGS = -version-info 2:2:1 ++libpaper_la_LDFLAGS = -no-undefined -version-info 2:2:1 + libpaper_la_CPPFLAGS = -D_REENTRANT + + BUILT_SOURCES = paperspecs.h diff --git a/src/libpaper.mk b/src/libpaper.mk index f39a482d..f0fd74ca 100644 --- a/src/libpaper.mk +++ b/src/libpaper.mk @@ -3,8 +3,8 @@ PKG := libpaper $(PKG)_WEBSITE := https://packages.debian.org/unstable/libpaper1 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.24+nmu4 -$(PKG)_CHECKSUM := 2491fce3f590d922d2d3070555df4425921b89c76a18e1c62e36336d6657526a +$(PKG)_VERSION := 1.1.24+nmu5 +$(PKG)_CHECKSUM := e29deda4cd7350189c71af0925cbf4a4473f9841d1419a922e1e8ff1954db1f2 $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE) @@ -18,12 +18,17 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + cd '$(SOURCE_DIR)' && autoreconf -fi + cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ + $(MXE_CONFIGURE_OPTS) + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + + # create pkg-config file + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'Name: libpaper'; \ + echo 'Version: $($(PKG)_VERSION)'; \ + echo 'Description: library for handling paper characteristics'; \ + echo 'Libs: -lpaper';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/libpaper.pc' endef -$(PKG)_BUILD_SHARED =