From 2e8fd90a02ce0fd1c0a700cc134a51a0f7629c27 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 23 Dec 2018 04:50:45 -0500 Subject: project: config, cfghost.sh: simply & unify cfghost profiles (cf. cad286e). --- config/linux/config.c | 19 +++++++++++++++++++ config/linux/config.mk | 30 ++++++++++++++++++++++++++++++ config/linux/pyconfig.h | 11 +++++++++++ config/midipix/config.c | 17 +++++++++++++++++ config/midipix/config.mk | 26 ++++++++++++++++++++++++++ config/midipix/pyconfig.h | 10 ++++++++++ config/x86_64-linux/config.c | 19 ------------------- config/x86_64-linux/config.mk | 30 ------------------------------ config/x86_64-linux/pyconfig.h | 11 ----------- config/x86_64-midipix/config.c | 17 ----------------- config/x86_64-midipix/config.mk | 26 -------------------------- config/x86_64-midipix/pyconfig.h | 10 ---------- project/config/cfghost.sh | 8 ++++---- 13 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 config/linux/config.c create mode 100644 config/linux/config.mk create mode 100644 config/linux/pyconfig.h create mode 100644 config/midipix/config.c create mode 100644 config/midipix/config.mk create mode 100644 config/midipix/pyconfig.h delete mode 100644 config/x86_64-linux/config.c delete mode 100644 config/x86_64-linux/config.mk delete mode 100644 config/x86_64-linux/pyconfig.h delete mode 100644 config/x86_64-midipix/config.c delete mode 100644 config/x86_64-midipix/config.mk delete mode 100644 config/x86_64-midipix/pyconfig.h diff --git a/config/linux/config.c b/config/linux/config.c new file mode 100644 index 0000000..d4d2384 --- /dev/null +++ b/config/linux/config.c @@ -0,0 +1,19 @@ +#include "linkage/inittab.h" + +struct _inittab _PyImport_Inittab[] = { + + PY_IMPORT_INITTAB_BASE, + PY_IMPORT_INITTAB_COMMON, + +#ifdef PY_ALL_STATIC + PY_IMPORT_INITTAB_ANYOS_CORE, + PY_IMPORT_INITTAB_ANYOS_AUDIO, + PY_IMPORT_INITTAB_LINUX_AUDIO, +#endif + +#ifdef PY_FOR_PYCOMPILE + PY_IMPORT_INITTAB_PYCOMPILE_CORE, +#endif + + {0, 0} +}; diff --git a/config/linux/config.mk b/config/linux/config.mk new file mode 100644 index 0000000..4293b37 --- /dev/null +++ b/config/linux/config.mk @@ -0,0 +1,30 @@ +# platform +PYTHON_PATH = +PYTHON_PLATFORM = linux2 + + +# extensions: built-in +CONFIG_SRCS = $(CONFIG_DEFAULT_SRCS) + + +# extensions: dynamic loading +DYNLOAD_SRCS = \ + core/Python/dynload_shlib.c \ + + +# extensions: desired subsets +include $(PROJECT_DIR)/profiles/pyexts/subsets.mk + +PYEXT_SHARED = \ + $(PYEXT_SUBSET_SHARED_ANYOS_CORE) \ + $(PYEXT_SUBSET_SHARED_ANYOS_AUDIO) \ + $(PYEXT_SUBSET_SHARED_LINUX_AUDIO) \ + +PYEXT_STATIC = \ + $(PYEXT_SUBSET_STATIC_ANYOS_CORE) \ + $(PYEXT_SUBSET_STATIC_ANYOS_AUDIO) \ + $(PYEXT_SUBSET_STATIC_LINUX_AUDIO) \ + + +# strict shared object generation +LDFLAGS_STRICT += -Wl,-no-undefined diff --git a/config/linux/pyconfig.h b/config/linux/pyconfig.h new file mode 100644 index 0000000..b91d2f7 --- /dev/null +++ b/config/linux/pyconfig.h @@ -0,0 +1,11 @@ +#ifndef PY_PYCONFIG_H +#define PY_PYCONFIG_H + +#include "osapi/modern.h" +#include "osapi/linux.h" +#include "osapi/overrides.h" + +/* cf. Modules/posixmodule.c */ +#define HAVE_BROKEN_NICE 1 + +#endif diff --git a/config/midipix/config.c b/config/midipix/config.c new file mode 100644 index 0000000..0304e40 --- /dev/null +++ b/config/midipix/config.c @@ -0,0 +1,17 @@ +#include "linkage/inittab.h" + +struct _inittab _PyImport_Inittab[] = { + + PY_IMPORT_INITTAB_BASE, + PY_IMPORT_INITTAB_COMMON, + +#ifdef PY_ALL_STATIC + PY_IMPORT_INITTAB_ANYOS_CORE, +#endif + +#ifdef PY_FOR_PYCOMPILE + PY_IMPORT_INITTAB_PYCOMPILE_CORE, +#endif + + {0, 0} +}; diff --git a/config/midipix/config.mk b/config/midipix/config.mk new file mode 100644 index 0000000..e9c672d --- /dev/null +++ b/config/midipix/config.mk @@ -0,0 +1,26 @@ +# platform +PYTHON_PATH = +PYTHON_PLATFORM = midipix + + +# extensions: built-in +CONFIG_SRCS = $(CONFIG_DEFAULT_SRCS) + + +# extensions: dynamic loading +DYNLOAD_SRCS = \ + core/Python/dynload_shlib.c \ + + +# extensions: desired subsets +include $(PROJECT_DIR)/profiles/pyexts/subsets.mk + +PYEXT_SHARED = \ + $(PYEXT_SUBSET_SHARED_ANYOS_CORE) \ + +PYEXT_STATIC = \ + $(PYEXT_SUBSET_STATIC_ANYOS_CORE) \ + + +# strict shared object generation +LDFLAGS_STRICT += -Wl,-no-undefined diff --git a/config/midipix/pyconfig.h b/config/midipix/pyconfig.h new file mode 100644 index 0000000..2a93226 --- /dev/null +++ b/config/midipix/pyconfig.h @@ -0,0 +1,10 @@ +#ifndef PY_PYCONFIG_H +#define PY_PYCONFIG_H + +#include "osapi/modern.h" +#include "osapi/midipix.h" + +/* cf. Modules/posixmodule.c */ +#define HAVE_BROKEN_NICE 1 + +#endif diff --git a/config/x86_64-linux/config.c b/config/x86_64-linux/config.c deleted file mode 100644 index d4d2384..0000000 --- a/config/x86_64-linux/config.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "linkage/inittab.h" - -struct _inittab _PyImport_Inittab[] = { - - PY_IMPORT_INITTAB_BASE, - PY_IMPORT_INITTAB_COMMON, - -#ifdef PY_ALL_STATIC - PY_IMPORT_INITTAB_ANYOS_CORE, - PY_IMPORT_INITTAB_ANYOS_AUDIO, - PY_IMPORT_INITTAB_LINUX_AUDIO, -#endif - -#ifdef PY_FOR_PYCOMPILE - PY_IMPORT_INITTAB_PYCOMPILE_CORE, -#endif - - {0, 0} -}; diff --git a/config/x86_64-linux/config.mk b/config/x86_64-linux/config.mk deleted file mode 100644 index 4293b37..0000000 --- a/config/x86_64-linux/config.mk +++ /dev/null @@ -1,30 +0,0 @@ -# platform -PYTHON_PATH = -PYTHON_PLATFORM = linux2 - - -# extensions: built-in -CONFIG_SRCS = $(CONFIG_DEFAULT_SRCS) - - -# extensions: dynamic loading -DYNLOAD_SRCS = \ - core/Python/dynload_shlib.c \ - - -# extensions: desired subsets -include $(PROJECT_DIR)/profiles/pyexts/subsets.mk - -PYEXT_SHARED = \ - $(PYEXT_SUBSET_SHARED_ANYOS_CORE) \ - $(PYEXT_SUBSET_SHARED_ANYOS_AUDIO) \ - $(PYEXT_SUBSET_SHARED_LINUX_AUDIO) \ - -PYEXT_STATIC = \ - $(PYEXT_SUBSET_STATIC_ANYOS_CORE) \ - $(PYEXT_SUBSET_STATIC_ANYOS_AUDIO) \ - $(PYEXT_SUBSET_STATIC_LINUX_AUDIO) \ - - -# strict shared object generation -LDFLAGS_STRICT += -Wl,-no-undefined diff --git a/config/x86_64-linux/pyconfig.h b/config/x86_64-linux/pyconfig.h deleted file mode 100644 index b91d2f7..0000000 --- a/config/x86_64-linux/pyconfig.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef PY_PYCONFIG_H -#define PY_PYCONFIG_H - -#include "osapi/modern.h" -#include "osapi/linux.h" -#include "osapi/overrides.h" - -/* cf. Modules/posixmodule.c */ -#define HAVE_BROKEN_NICE 1 - -#endif diff --git a/config/x86_64-midipix/config.c b/config/x86_64-midipix/config.c deleted file mode 100644 index 0304e40..0000000 --- a/config/x86_64-midipix/config.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "linkage/inittab.h" - -struct _inittab _PyImport_Inittab[] = { - - PY_IMPORT_INITTAB_BASE, - PY_IMPORT_INITTAB_COMMON, - -#ifdef PY_ALL_STATIC - PY_IMPORT_INITTAB_ANYOS_CORE, -#endif - -#ifdef PY_FOR_PYCOMPILE - PY_IMPORT_INITTAB_PYCOMPILE_CORE, -#endif - - {0, 0} -}; diff --git a/config/x86_64-midipix/config.mk b/config/x86_64-midipix/config.mk deleted file mode 100644 index e9c672d..0000000 --- a/config/x86_64-midipix/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# platform -PYTHON_PATH = -PYTHON_PLATFORM = midipix - - -# extensions: built-in -CONFIG_SRCS = $(CONFIG_DEFAULT_SRCS) - - -# extensions: dynamic loading -DYNLOAD_SRCS = \ - core/Python/dynload_shlib.c \ - - -# extensions: desired subsets -include $(PROJECT_DIR)/profiles/pyexts/subsets.mk - -PYEXT_SHARED = \ - $(PYEXT_SUBSET_SHARED_ANYOS_CORE) \ - -PYEXT_STATIC = \ - $(PYEXT_SUBSET_STATIC_ANYOS_CORE) \ - - -# strict shared object generation -LDFLAGS_STRICT += -Wl,-no-undefined diff --git a/config/x86_64-midipix/pyconfig.h b/config/x86_64-midipix/pyconfig.h deleted file mode 100644 index 2a93226..0000000 --- a/config/x86_64-midipix/pyconfig.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef PY_PYCONFIG_H -#define PY_PYCONFIG_H - -#include "osapi/modern.h" -#include "osapi/midipix.h" - -/* cf. Modules/posixmodule.c */ -#define HAVE_BROKEN_NICE 1 - -#endif diff --git a/project/config/cfghost.sh b/project/config/cfghost.sh index 8e9561e..c862e2b 100644 --- a/project/config/cfghost.sh +++ b/project/config/cfghost.sh @@ -20,11 +20,11 @@ cfghost_internal_test() if [ -z $mb_internal_cfghost ]; then case $mb_internal_cchost in - x86_64-*-linux | x86_64-*-linux-* | x86_64-linux-* ) - mb_internal_cfghost=x86_64-linux ;; + *-linux | *-linux-* ) + mb_internal_cfghost='linux' ;; - x86_64-*-midipix | x86_64-*-midipix-* | x86_64-midipix-* ) - mb_internal_cfghost=x86_64-midipix ;; + *-midipix | *-midipix-* ) + mb_internal_cfghost='midipix' ;; * ) mb_internal_cfghost='any-host' ;; -- cgit v1.2.3