From b6500966254cdcb1e172bfe4102217252bee579e Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 26 Aug 2020 09:29:44 +0200 Subject: replace host-zlib with host-system-zlib This is a first step to make gcc plugins possible. The header files for plugins include the headers for several of host libraries that are currently statically compiled. Use the system versions of those libraries. This way the user can install the corresponding devel packages. Then gcc plugins can be built. zlib is not needed for plugins but one more dependency into the system makes no difference and this makes maintaining the toolchain easier. Signed-off-by: Michael Olbrich --- rules/cross-binutils.in | 2 +- rules/cross-gcc.in | 4 ++-- rules/cross-gdb.in | 2 +- rules/cross-llvm.in | 2 +- rules/host-system-zlib.in | 4 ++++ rules/host-system-zlib.make | 27 +++++++++++++++++++++++++++ rules/host-zlib.in | 4 ---- rules/host-zlib.make | 44 -------------------------------------------- 8 files changed, 36 insertions(+), 53 deletions(-) create mode 100644 rules/host-system-zlib.in create mode 100644 rules/host-system-zlib.make delete mode 100644 rules/host-zlib.in delete mode 100644 rules/host-zlib.make (limited to 'rules') diff --git a/rules/cross-binutils.in b/rules/cross-binutils.in index d29c4e4..1cc2244 100644 --- a/rules/cross-binutils.in +++ b/rules/cross-binutils.in @@ -2,7 +2,7 @@ menuconfig CROSS_BINUTILS bool - select HOST_ZLIB + select HOST_SYSTEM_ZLIB select HOST_FAKE_MAKEINFO prompt "binutils " diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in index 7cc117b..930ea5e 100644 --- a/rules/cross-gcc.in +++ b/rules/cross-gcc.in @@ -8,7 +8,7 @@ menuconfig CROSS_GCC select HOST_SYSTEM_GMP select HOST_SYSTEM_MPFR select HOST_SYSTEM_MPC - select HOST_ZLIB + select HOST_SYSTEM_ZLIB select HOST_SYSTEM_ISL select CROSS_ECJ if CROSS_GCC_LANG_JAVA @@ -221,6 +221,6 @@ config CROSS_GCC_FIRST select HOST_SYSTEM_GMP select HOST_SYSTEM_MPFR select HOST_SYSTEM_MPC - select HOST_ZLIB + select HOST_SYSTEM_ZLIB select HOST_SYSTEM_ISL diff --git a/rules/cross-gdb.in b/rules/cross-gdb.in index 07a8f7d..d12dc80 100644 --- a/rules/cross-gdb.in +++ b/rules/cross-gdb.in @@ -3,7 +3,7 @@ menuconfig CROSS_GDB select HOST_SYSTEM_PYTHON3 select HOST_SYSTEM_EXPAT select HOST_SYSTEM_GMP - select HOST_ZLIB + select HOST_SYSTEM_ZLIB select HOST_XZ help GDB is a source-level debugger, capable of breaking programs diff --git a/rules/cross-llvm.in b/rules/cross-llvm.in index de400e9..42682f2 100644 --- a/rules/cross-llvm.in +++ b/rules/cross-llvm.in @@ -2,7 +2,7 @@ menuconfig CROSS_LLVM tristate select HOST_CMAKE select HOST_NINJA - select HOST_ZLIB + select HOST_SYSTEM_ZLIB select CROSS_GCC prompt "llvm " help diff --git a/rules/host-system-zlib.in b/rules/host-system-zlib.in new file mode 100644 index 0000000..eb6e33a --- /dev/null +++ b/rules/host-system-zlib.in @@ -0,0 +1,4 @@ +## SECTION=hosttools_noprompt + +config HOST_SYSTEM_ZLIB + tristate diff --git a/rules/host-system-zlib.make b/rules/host-system-zlib.make new file mode 100644 index 0000000..33c3cd7 --- /dev/null +++ b/rules/host-system-zlib.make @@ -0,0 +1,27 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Michael Olbrich +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_SYSTEM_ZLIB) += host-system-zlib +HOST_SYSTEM_ZLIB_LICENSE := ignore + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +$(STATEDIR)/host-system-zlib.prepare: + @$(call targetinfo) + @echo "Checking for zlib ..." + @pkg-config zlib || \ + ptxd_bailout "zlib development files not found!" \ + "Please install zlib1g-dev (debian)" + @$(call touch) + +# vim: syntax=make diff --git a/rules/host-zlib.in b/rules/host-zlib.in deleted file mode 100644 index 4b85138..0000000 --- a/rules/host-zlib.in +++ /dev/null @@ -1,4 +0,0 @@ -## SECTION=hosttools_noprompt - -config HOST_ZLIB - bool diff --git a/rules/host-zlib.make b/rules/host-zlib.make deleted file mode 100644 index 5198289..0000000 --- a/rules/host-zlib.make +++ /dev/null @@ -1,44 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006 by Pengutronix e.K., Hildesheim, Germany -# 2009 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_ZLIB) += host-zlib - -# -# Paths and names -# -HOST_ZLIB_VERSION := 1.2.11 -HOST_ZLIB_MD5 := 85adef240c5f370b308da8c938951a68 -HOST_ZLIB := zlib-$(HOST_ZLIB_VERSION) -HOST_ZLIB_SUFFIX := tar.xz -HOST_ZLIB_URL := \ - http://zlib.net/$(HOST_ZLIB).$(HOST_ZLIB_SUFFIX) \ - $(call ptx/mirror, SF, libpng/$(HOST_ZLIB).$(HOST_ZLIB_SUFFIX)) -HOST_ZLIB_SOURCE := $(SRCDIR)/$(HOST_ZLIB).$(HOST_ZLIB_SUFFIX) -HOST_ZLIB_DIR := $(HOST_BUILDDIR)/$(HOST_ZLIB) -HOST_ZLIB_LICENSE := Zlib -HOST_ZLIB_LICENSE_FILES := file://README;md5=0ff45db88393c3152e458a047bba0ff1 - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# -# autoconf -# -HOST_ZLIB_CONF_TOOL := autoconf -HOST_ZLIB_CONF_OPT := \ - $(PTX_HOST_AUTOCONF) \ - --static - -HOST_ZLIB_CFLAGS := -fPIC - -# vim: syntax=make -- cgit v1.2.3