From 13ac1d489b390d5e6d7573ae3d7508cdcbdacfb8 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 6 Dec 2018 10:15:30 +0100 Subject: rules: remove old unused mingw stuff Signed-off-by: Michael Olbrich --- Kconfig | 8 --- fixup_ptxconfigs.sh | 6 --- rules/libc.in | 8 --- rules/mingw-runtime-headers.in | 6 --- rules/mingw-runtime-headers.make | 73 --------------------------- rules/mingw-runtime.in | 32 ------------ rules/mingw-runtime.make | 104 -------------------------------------- rules/w32api-headers.in | 7 --- rules/w32api-headers.make | 78 ----------------------------- rules/w32api.in | 21 -------- rules/w32api.make | 105 --------------------------------------- 11 files changed, 448 deletions(-) delete mode 100644 rules/mingw-runtime-headers.in delete mode 100644 rules/mingw-runtime-headers.make delete mode 100644 rules/mingw-runtime.in delete mode 100644 rules/mingw-runtime.make delete mode 100644 rules/w32api-headers.in delete mode 100644 rules/w32api-headers.make delete mode 100644 rules/w32api.in delete mode 100644 rules/w32api.make diff --git a/Kconfig b/Kconfig index 0280b51..13d9c9d 100644 --- a/Kconfig +++ b/Kconfig @@ -55,13 +55,6 @@ if LIBC_AVR source "workspace/rules/avrlib.in" endif -if LIBC_MINGW -source "workspace/rules/mingw-runtime.in" -source "workspace/rules/mingw-runtime-headers.in" -source "workspace/rules/w32api.in" -source "workspace/rules/w32api-headers.in" -endif - source "workspace/rules/cross-binutils.in" source "workspace/rules/cross-elf2flt.in" source "workspace/rules/kernel-headers.in" @@ -116,7 +109,6 @@ config PREFIX_TCID default "gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-uclibc-${PTXCONF_UCLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" if LIBC_UCLIBC default "gcc-${PTXCONF_CROSS_GCC_VERSION}-newlib-${PTXCONF_NEWLIB_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}" if LIBC_NEWLIB default "gcc-${PTXCONF_CROSS_GCC_VERSION}-libc-${PTXCONF_AVRLIB_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}" if LIBC_AVR - default "gcc-${PTXCONF_CROSS_GCC_VERSION}-mingw-${PTXCONF_MINGW_RUNTIME_VERSION}-w32api-${PTXCONF_W32API_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}" if LIBC_MINGW config SYSROOT_HOST string diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh index 7690f53..381c4b0 100755 --- a/fixup_ptxconfigs.sh +++ b/fixup_ptxconfigs.sh @@ -79,12 +79,6 @@ fixup() java) PTXCONF_CROSS_GCC_LANG_JAVA=y ;; - mingw*) - PTXCONF_MINGW_RUNTIME_VERSION="${part##mingw-}" - ;; - w32api*) - PTXCONF_W32API_VERSION="${part##w32api-}" - ;; *) PTXCONF_GNU_TARGET="${PTXCONF_GNU_TARGET}${PTXCONF_GNU_TARGET:+_}${part}" ;; diff --git a/rules/libc.in b/rules/libc.in index 57ccbdc..10c1259 100644 --- a/rules/libc.in +++ b/rules/libc.in @@ -2,8 +2,6 @@ config LIBC_HEADERS bool select GLIBC_HEADERS if LIBC_GLIBC select UCLIBC_HEADERS if LIBC_UCLIBC - select W32API_HEADERS if LIBC_MINGW - select MINGW_RUNTIME_HEADERS if LIBC_MINGW config LIBC_FIRST bool @@ -12,8 +10,6 @@ config LIBC_FIRST select GLIBC_FIRST if LIBC_GLIBC select UCLIBC if LIBC_UCLIBC select NEWLIB if LIBC_NEWLIB - select W32API if LIBC_MINGW - select MINGW_RUNTIME if LIBC_MINGW select AVRLIB if LIBC_AVR config LIBC @@ -38,10 +34,6 @@ choice bool prompt "newlib " - config LIBC_MINGW - bool - prompt "mingw " - config LIBC_AVR bool prompt "AVR-8 libc " diff --git a/rules/mingw-runtime-headers.in b/rules/mingw-runtime-headers.in deleted file mode 100644 index 03d0507..0000000 --- a/rules/mingw-runtime-headers.in +++ /dev/null @@ -1,6 +0,0 @@ -# config for mingw-runtime-headers - -config MINGW_RUNTIME_HEADERS - bool - select W32API_HEADERS - # no prompt diff --git a/rules/mingw-runtime-headers.make b/rules/mingw-runtime-headers.make deleted file mode 100644 index 389a9c1..0000000 --- a/rules/mingw-runtime-headers.make +++ /dev/null @@ -1,73 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006 by Robert Schwebel -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_MINGW_RUNTIME_HEADERS) += mingw-runtime-headers - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime-headers.get: $(STATEDIR)/mingw-runtime.get - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime-headers.extract: $(STATEDIR)/mingw-runtime.extract - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime-headers.prepare: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime-headers.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime-headers.install: - @$(call targetinfo) - mkdir -p $(SYSROOT)/mingw/include - cp -r $(MINGW_RUNTIME_DIR)/include/* $(SYSROOT)/mingw/include - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime-headers.targetinstall: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -mingw-runtime-headers_clean: - rm -rf $(STATEDIR)/mingw-runtime-headers.* - -# vim: syntax=make diff --git a/rules/mingw-runtime.in b/rules/mingw-runtime.in deleted file mode 100644 index dfe4fab..0000000 --- a/rules/mingw-runtime.in +++ /dev/null @@ -1,32 +0,0 @@ -# config for mingw-runtime - -menuconfig MINGW_RUNTIME - bool - select W32API - - select TOOLCHAIN_ENABLE_SYSROOT - select TOOLCHAIN_DISABLE_MULTILIB - - select CROSS_GCC_FIRST - select CROSS_GCC_ENABLE_CXA_ATEXIT - select CROSS_GCC_DISABLE_SJLJ_EXCEPTIONS - select CROSS_GCC_DISABLE_LIBSSP - select CROSS_GCC_ENABLE_SHARED - select CROSS_GCC_THREADS_WIN32 - - prompt "mingw-runtime " - -if MINGW_RUNTIME - -config MINGW_RUNTIME_VERSION - string - prompt "mingw-runtime version" - default "3.15.1" - help - Specify the mingw-runtime version here. - -config MINGW_RUNTIME_MD5 - string - prompt "mingw-runtime source md5sum" - -endif diff --git a/rules/mingw-runtime.make b/rules/mingw-runtime.make deleted file mode 100644 index 2b590ec..0000000 --- a/rules/mingw-runtime.make +++ /dev/null @@ -1,104 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006 by Robert Schwebel -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_MINGW_RUNTIME) += mingw-runtime - -# -# Paths and names -# -MINGW_RUNTIME_VERSION := $(call remove_quotes,$(PTXCONF_MINGW_RUNTIME_VERSION)) -MINGW_RUNTIME_MD5 := $(call remove_quotes,$(PTXCONF_MINGW_RUNTIME_MD5)) -MINGW_RUNTIME := mingwrt-$(MINGW_RUNTIME_VERSION)-mingw32 -MINGW_RUNTIME_SUFFIX := tar.gz -MINGW_RUNTIME_URL := $(PTXCONF_SETUP_SFMIRROR)/mingw/$(MINGW_RUNTIME)-src.$(MINGW_RUNTIME_SUFFIX) -MINGW_RUNTIME_SOURCE := $(SRCDIR)/$(MINGW_RUNTIME)-src.$(MINGW_RUNTIME_SUFFIX) -MINGW_RUNTIME_DIR := $(BUILDDIR)/$(MINGW_RUNTIME) -MINGW_RUNTIME_BUILDDIR := $(BUILDDIR)/$(MINGW_RUNTIME)-build - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(MINGW_RUNTIME_SOURCE): - @$(call targetinfo) - @$(call get, MINGW_RUNTIME) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime.extract: - @$(call targetinfo) - @$(call clean, $(MINGW_RUNTIME_DIR)) - @$(call extract, MINGW_RUNTIME) - @$(call patchin, MINGW_RUNTIME, $(MINGW_RUNTIME_DIR)) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -MINGW_RUNTIME_PATH := PATH=$(CROSS_PATH) -MINGW_RUNTIME_ENV := $(CROSS_ENV) - -MINGW_RUNTIME_AUTOCONF := \ - --prefix=$(SYSROOT)/mingw \ - --host=$(PTXCONF_GNU_TARGET) \ - --target=$(PTXCONF_GNU_TARGET) - -$(STATEDIR)/mingw-runtime.prepare: - @$(call targetinfo) - @$(call clean, $(MINGW_RUNTIME_BUILDDIR)) - mkdir -p $(MINGW_RUNTIME_BUILDDIR) - cd $(MINGW_RUNTIME_BUILDDIR) && $(MINGW_RUNTIME_ENV) $(MINGW_RUNTIME_PATH) \ - $(MINGW_RUNTIME_DIR)/configure $(MINGW_RUNTIME_AUTOCONF) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime.compile: - @$(call targetinfo) - cd $(MINGW_RUNTIME_BUILDDIR) && $(MINGW_RUNTIME_PATH) \ - $(MAKE) $(PARALLELMFLAGS) W32API_INCLUDE=-I$(SYSROOT)/mingw/include - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime.install: - @$(call targetinfo) - cd $(MINGW_RUNTIME_BUILDDIR) && \ - $(MINGW_RUNTIME_PATH) $(MAKE) \ - install_root=$(SYSROOT) install - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mingw-runtime.targetinstall: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -mingw-runtime_clean: - rm -rf $(STATEDIR)/mingw-runtime.* - rm -rf $(MINGW_RUNTIME_DIR) - -# vim: syntax=make diff --git a/rules/w32api-headers.in b/rules/w32api-headers.in deleted file mode 100644 index d84c854..0000000 --- a/rules/w32api-headers.in +++ /dev/null @@ -1,7 +0,0 @@ -# config for w32api-headers - -config W32API_HEADERS - bool - # no prompt - - diff --git a/rules/w32api-headers.make b/rules/w32api-headers.make deleted file mode 100644 index 7fb3771..0000000 --- a/rules/w32api-headers.make +++ /dev/null @@ -1,78 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006 by Robert Schwebel -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_W32API_HEADERS) += w32api-headers - -# -# Paths and names -# -W32API_HEADERS_DIR = $(BUILDDIR)/$(W32API)-headers - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api-headers.get: $(STATEDIR)/w32api.get - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api-headers.extract: $(STATEDIR)/w32api.extract - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api-headers.prepare: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api-headers.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api-headers.install: - @$(call targetinfo) - mkdir -p $(SYSROOT)/mingw/include - cp -r $(W32API_DIR)/include/* $(SYSROOT)/mingw/include - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api-headers.targetinstall: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -w32api-headers_clean: - rm -rf $(STATEDIR)/w32api-headers.* - -# vim: syntax=make diff --git a/rules/w32api.in b/rules/w32api.in deleted file mode 100644 index 936bcef..0000000 --- a/rules/w32api.in +++ /dev/null @@ -1,21 +0,0 @@ -# config for w32api-headers - -menuconfig W32API - bool - select CROSS_GCC_FIRST - prompt "w32api " - -if W32API - -config W32API_VERSION - string - prompt "w32api version" - default "3.12" - help - Specify the w32api version here. - -config W32API_MD5 - string - prompt "w32api source md5sum" - -endif diff --git a/rules/w32api.make b/rules/w32api.make deleted file mode 100644 index b5195c7..0000000 --- a/rules/w32api.make +++ /dev/null @@ -1,105 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006 by Robert Schwebel -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_W32API) += w32api - -# -# Paths and names -# -W32API_VERSION := $(call remove_quotes,$(PTXCONF_W32API_VERSION)) -W32API_MD5 := $(call remove_quotes,$(PTXCONF_W32API_MD5)) -W32API := w32api-$(W32API_VERSION)-mingw32 -W32API_SUFFIX := tar.gz -W32API_URL := $(PTXCONF_SETUP_SFMIRROR)/mingw/$(W32API)-src.$(W32API_SUFFIX) -W32API_SOURCE := $(SRCDIR)/$(W32API)-src.$(W32API_SUFFIX) -W32API_DIR := $(BUILDDIR)/$(W32API) -W32API_BUILDDIR := $(BUILDDIR)/$(W32API)-build - - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(W32API_SOURCE): - @$(call targetinfo) - @$(call get, W32API) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api.extract: - @$(call targetinfo) - @$(call clean, $(W32API_DIR)) - @$(call extract, W32API) - @$(call patchin, W32API) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -W32API_PATH := PATH=$(CROSS_PATH) -W32API_ENV := $(CROSS_ENV) - -W32API_AUTOCONF := \ - --prefix=$(SYSROOT)/mingw \ - --host=$(PTXCONF_GNU_TARGET) \ - --target=$(PTXCONF_GNU_TARGET) - -$(STATEDIR)/w32api.prepare: - @$(call targetinfo) - @$(call clean, $(W32API_BUILDDIR)) - mkdir -p $(W32API_BUILDDIR) - cd $(W32API_BUILDDIR) && $(W32API_ENV) $(W32API_PATH) \ - $(W32API_DIR)/configure $(W32API_AUTOCONF) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api.compile: - @$(call targetinfo) - cd $(W32API_BUILDDIR) && $(W32API_PATH) \ - $(MAKE) $(PARALLELMFLAGS) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api.install: - @$(call targetinfo) - cd $(W32API_BUILDDIR) && \ - $(W32API_PATH) $(MAKE) \ - install_root=$(SYSROOT) install - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/w32api.targetinstall: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -w32api_clean: - rm -rf $(STATEDIR)/w32api.* - rm -rf $(W32API_DIR) - -# vim: syntax=make -- cgit v1.2.3