head 1.3; access; symbols pkgsrc-2020Q2:1.2.0.8 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.4 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.6 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.2 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.1.0.20 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.18 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.16 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.14 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.12 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.10 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.8 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.6 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.2 pkgsrc-2017Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2020.08.19.10.39.26; author bouyer; state dead; branches; next 1.2; commitid DGAMglRf0Jde6FkC; 1.2 date 2019.08.30.13.23.10; author bouyer; state Exp; branches; next 1.1; commitid xQ60Xp3vVRX6o3BB; 1.1 date 2017.03.30.09.15.10; author bouyer; state Exp; branches; next ; commitid V1M4BMcEuvLRkyLz; desc @@ 1.3 log @Remove xenkernel and xentools packages older than 4.11. They're not maintained anymore upstream, and don't build on supported NetBSD releases. @ text @$NetBSD: patch-stubdom_Makefile,v 1.2 2019/08/30 13:23:10 bouyer Exp $ --- stubdom/Makefile.orig 2018-12-03 10:03:57.000000000 +0100 +++ stubdom/Makefile 2019-08-30 11:47:09.000000000 +0200 @@@@ -6,8 +6,6 @@@@ export stubdom=y export debug=y -# Moved from config/StdGNU.mk -CFLAGS += -O1 -fno-omit-frame-pointer ifeq (,$(findstring clean,$(MAKECMDGOALS))) ifeq ($(wildcard $(MINI_OS)/Config.mk),) @@@@ -24,27 +22,27 @@@@ endif ifeq ($(GNU_TARGET_ARCH), i686) -TARGET_CFLAGS= +TARGET_CFLAGS=-O1 -fno-omit-frame-pointer NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS STUBDOM_SUPPORTED=1 +MINIOS_TARGET_ARCH:=x86 endif ifeq ($(GNU_TARGET_ARCH), x86_64) TARGET_CFLAGS=-mno-red-zone NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS STUBDOM_SUPPORTED=1 +MINIOS_TARGET_ARCH:=x86 endif CROSS_ROOT=cross-root-$(GNU_TARGET_ARCH) CROSS_PREFIX=$(CURDIR)/$(CROSS_ROOT) # Disable PIE/SSP if GCC supports them. They can break us. -TARGET_CFLAGS += $(CFLAGS) -TARGET_CPPFLAGS += $(CPPFLAGS) -$(call cc-options-add,TARGET_CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) +$(call cc-options-add,TARGET_CFLAGS,TARGET_CC,$(EMBEDDED_EXTRA_CFLAGS)) # Do not use host headers and libs -GCC_INSTALL = $(shell LANG=C gcc -print-search-dirs | sed -n -e 's/install: \(.*\)/\1/p') -TARGET_CPPFLAGS += -U __linux__ -U __FreeBSD__ -U __sun__ +GCC_INSTALL = $(shell LANG=C ${TARGET_CC} -print-search-dirs | sed -n -e 's/install: \(.*\)/\1/p') +TARGET_CPPFLAGS += -U __linux__ -U __FreeBSD__ -U __NetBSD__ -U __sun__ TARGET_CPPFLAGS += -nostdinc TARGET_CPPFLAGS += -isystem $(MINI_OS)/include/posix TARGET_CPPFLAGS += -isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include @@@@ -74,11 +72,8 @@@@ # Cross-newlib ############## -newlib-$(NEWLIB_VERSION).tar.gz: - $(FETCHER) $@@ $(NEWLIB_URL)/$@@ - -newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz - tar xzf $< +newlib-$(NEWLIB_VERSION): + cp -r ${WRKSRC}/../newlib-$(NEWLIB_VERSION) . patch -d $@@ -p0 < newlib.patch patch -d $@@ -p0 < newlib-chk.patch patch -d $@@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch @@@@ -92,7 +87,7 @@@@ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) mkdir -p newlib-$(XEN_TARGET_ARCH) ( cd newlib-$(XEN_TARGET_ARCH) && \ - CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ + CFLAGS_FOR_BUILD="$(CFLAGS)" CFLAGS="" CC_FOR_TARGET="$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) -isystem $(MINI_OS)/include/$(MINIOS_TARGET_ARCH)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ $(MAKE) DESTDIR= && \ $(MAKE) DESTDIR= install ) @@@@ -100,19 +95,15 @@@@ # Cross-zlib ############ -zlib-$(ZLIB_VERSION).tar.gz: - $(FETCHER) $@@ $(ZLIB_URL)/$@@ - -zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz - tar xzf $< - mv zlib-$(ZLIB_VERSION) $@@ +zlib-$(XEN_TARGET_ARCH): + cp -r ${WRKSRC}/../zlib-$(ZLIB_VERSION) $@@ ZLIB_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libz.a .PHONY: cross-zlib cross-zlib: $(ZLIB_STAMPFILE) $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) ( cd $< && \ - CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(TARGET_CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ $(MAKE) DESTDIR= libz.a && \ $(MAKE) DESTDIR= install ) @@@@ -120,12 +111,8 @@@@ # Cross-libpci ############## -pciutils-$(LIBPCI_VERSION).tar.bz2: - $(FETCHER) $@@ $(LIBPCI_URL)/$@@ - -pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 - tar xjf $< - mv pciutils-$(LIBPCI_VERSION) $@@ +pciutils-$(XEN_TARGET_ARCH): + cp -r ${WRKSRC}/../pciutils-$(LIBPCI_VERSION) $@@ patch -d $@@ -p1 < pciutils.patch touch $@@ @@@@ -138,7 +125,7 @@@@ chmod u+w lib/config.h && \ echo '#define PCILIB_VERSION "$(LIBPCI_VERSION)"' >> lib/config.h && \ ln -sf ../../libpci.config.mak lib/config.mk && \ - $(MAKE) DESTDIR= CC="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(call realpath,$(MINI_OS)/include)" lib/libpci.a && \ + $(MAKE) DESTDIR= CC="$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -isystem $(call realpath,$(MINI_OS)/include) -isystem $(call realpath,$(MINI_OS)/include/$(MINIOS_TARGET_ARCH)) -isystem $(call realpath,$(MINI_OS)/include/$(MINIOS_TARGET_ARCH)/$(XEN_TARGET_ARCH))" CPPFLAGS="" CFLAGS="" lib/libpci.a && \ $(INSTALL_DATA) lib/libpci.a $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib/ && \ $(INSTALL_DIR) $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include/pci && \ $(INSTALL_DATA) lib/config.h lib/header.h lib/pci.h lib/types.h $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include/pci/ \ @@@@ -148,12 +135,8 @@@@ # lwIP ###### -lwip-$(LWIP_VERSION).tar.gz: - $(FETCHER) $@@ $(LWIP_URL)/$@@ - -lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz - tar xzf $< - mv lwip $@@ +lwip-$(XEN_TARGET_ARCH): + cp -r ${WRKSRC}/../lwip $@@ patch -d $@@ -p0 < lwip.patch-cvs patch -d $@@ -p0 < lwip.dhcp_create_request-hwaddr_len.patch touch $@@ @@@@ -161,19 +144,14 @@@@ ############# # cross-gmp ############# -gmp-$(GMP_VERSION).tar.bz2: - $(FETCHER) $@@ $(GMP_URL)/$@@ - .PHONY: cross-gmp ifeq ($(XEN_TARGET_ARCH), x86_32) GMPEXT=ABI=32 endif -gmp-$(XEN_TARGET_ARCH): gmp-$(GMP_VERSION).tar.bz2 $(NEWLIB_STAMPFILE) - tar xjf $< - rm $@@ -rf || : - mv gmp-$(GMP_VERSION) $@@ +gmp-$(XEN_TARGET_ARCH): $(NEWLIB_STAMPFILE) + cp -r ${WRKSRC}/../gmp-$(GMP_VERSION) $@@ #patch -d $@@ -p0 < gmp.patch - cd $@@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --libdir=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib --build=`gcc -dumpmachine` --host=$(GNU_TARGET_ARCH)-xen-elf + cd $@@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS) -isystem $(MINI_OS)/include/$(MINIOS_TARGET_ARCH) -isystem $(MINI_OS)/include" CFLAGS="$(TARGET_CFLAGS)" CC=$(TARGET_CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --libdir=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib --build=`${TARGET_CC} -dumpmachine` --host=$(GNU_TARGET_ARCH)-xen-elf sed -i 's/#define HAVE_OBSTACK_VPRINTF 1/\/\/#define HAVE_OBSTACK_VPRINTF 1/' $@@/config.h touch $@@ @@@@ -187,12 +165,8 @@@@ ############# # cross-polarssl ############# -polarssl-$(POLARSSL_VERSION)-gpl.tgz: - $(FETCHER) $@@ $(POLARSSL_URL)/$@@ - -polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz - tar xzf $< - mv polarssl-$(POLARSSL_VERSION) $@@ +polarssl-$(XEN_TARGET_ARCH): + cp -r ${WRKSRC}/../polarssl-$(POLARSSL_VERSION) $@@ patch -d $@@ -p1 < polarssl.patch touch $@@ @@@@ -200,7 +174,7 @@@@ cross-polarssl: $(POLARSSL_STAMPFILE) $(POLARSSL_STAMPFILE): polarssl-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) lwip-$(XEN_TARGET_ARCH) ( cd $