From 2d05b886690a0df4f148089099ad8816b64020b8 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 9 Dec 2018 00:37:31 -0500 Subject: config: introduced x86_64-linux in anticipation of a custom cfgdefs.sh. --- config/x86_64-alpine-linux-musl/config.mk | 2 +- config/x86_64-foxkit-linux-musl/config.mk | 2 +- config/x86_64-linux-musl/config.c | 19 ----------- config/x86_64-linux-musl/config.mk | 55 +------------------------------ config/x86_64-linux-musl/pyconfig.h | 12 ------- config/x86_64-linux/config.c | 19 +++++++++++ config/x86_64-linux/config.mk | 54 ++++++++++++++++++++++++++++++ config/x86_64-linux/pyconfig.h | 12 +++++++ 8 files changed, 88 insertions(+), 87 deletions(-) delete mode 100644 config/x86_64-linux-musl/config.c delete mode 100644 config/x86_64-linux-musl/pyconfig.h create mode 100644 config/x86_64-linux/config.c create mode 100644 config/x86_64-linux/config.mk create mode 100644 config/x86_64-linux/pyconfig.h diff --git a/config/x86_64-alpine-linux-musl/config.mk b/config/x86_64-alpine-linux-musl/config.mk index 3b9e8d3..92ad710 100644 --- a/config/x86_64-alpine-linux-musl/config.mk +++ b/config/x86_64-alpine-linux-musl/config.mk @@ -1 +1 @@ -CFGHOST_SYNONYM = x86_64-linux-musl +CFGHOST_SYNONYM = x86_64-linux diff --git a/config/x86_64-foxkit-linux-musl/config.mk b/config/x86_64-foxkit-linux-musl/config.mk index 3b9e8d3..92ad710 100644 --- a/config/x86_64-foxkit-linux-musl/config.mk +++ b/config/x86_64-foxkit-linux-musl/config.mk @@ -1 +1 @@ -CFGHOST_SYNONYM = x86_64-linux-musl +CFGHOST_SYNONYM = x86_64-linux diff --git a/config/x86_64-linux-musl/config.c b/config/x86_64-linux-musl/config.c deleted file mode 100644 index d4d2384..0000000 --- a/config/x86_64-linux-musl/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-musl/config.mk b/config/x86_64-linux-musl/config.mk index b6f0aaf..92ad710 100644 --- a/config/x86_64-linux-musl/config.mk +++ b/config/x86_64-linux-musl/config.mk @@ -1,54 +1 @@ -# platform -PYTHON_PATH = -PYTHON_PLATFORM = linux2 - - -# extensions: built-in -CONFIG_SRCS = $(CONFIG_DEFAULT_SRCS) - - -# extensions: dynamic loading -DYNLOAD_SRCS = \ - 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) \ - - -# shared extensions: dependency switches -CFLAGS_NCURSES = -I$(SYSROOT)/usr/local/include/ncurses -I$(SYSROOT)/usr/include/ncurses -LDFLAGS_NCURSES = -Wl,--as-needed -lpanelw -lncursesw -Wl,--no-as-needed - -CFLAGS_SQLITE = -I$(SYSROOT)/usr/local/include/sqlite3 -I$(SYSROOT)/usr/include/sqlite3 -CFLAGS_SQLITE += -DMODULE_NAME=\"sqlite3\" -CFLAGS_SQLITE += -DSQLITE_OMIT_LOAD_EXTENSION -LDFLAGS_SQLITE = -lsqlite3 - -CFLAGS_EXPAT = -DXML_DEV_URANDOM -LDFLAGS_EXPAT = -lexpat - -CFLAGS_DBM = -DHAVE_NDBM_H -LDFLAGS_DBM = -lgdbm_compat - - -# static extensions: dependency switch -LDFLAGS_PYEXT_STATIC = -lssl -lcrypto -lreadline -lbz2 -lgdbm -lffi -lintl -lz -LDFLAGS_NCURSES_STATIC = $(LDFLAGS_NCURSES) -LDFLAGS_SQLITE_STATIC = $(LDFLAGS_SQLITE) -LDFLAGS_EXPAT_STATIC = $(LDFLAGS_EXPAT) -LDFLAGS_DBM_STATIC = $(LDFLAGS_DBM) - - -# strict shared object generation -LDFLAGS_STRICT += -Wl,-no-undefined +CFGHOST_SYNONYM = x86_64-linux diff --git a/config/x86_64-linux-musl/pyconfig.h b/config/x86_64-linux-musl/pyconfig.h deleted file mode 100644 index 04acdb7..0000000 --- a/config/x86_64-linux-musl/pyconfig.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef PY_PYCONFIG_H -#define PY_PYCONFIG_H - -#include "osapi/modern.h" -#include "osapi/linux.h" -#include "toolchain/64-default.h" -#include "toolchain/64-le-ieee.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 new file mode 100644 index 0000000..d4d2384 --- /dev/null +++ b/config/x86_64-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/x86_64-linux/config.mk b/config/x86_64-linux/config.mk new file mode 100644 index 0000000..b6f0aaf --- /dev/null +++ b/config/x86_64-linux/config.mk @@ -0,0 +1,54 @@ +# platform +PYTHON_PATH = +PYTHON_PLATFORM = linux2 + + +# extensions: built-in +CONFIG_SRCS = $(CONFIG_DEFAULT_SRCS) + + +# extensions: dynamic loading +DYNLOAD_SRCS = \ + 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) \ + + +# shared extensions: dependency switches +CFLAGS_NCURSES = -I$(SYSROOT)/usr/local/include/ncurses -I$(SYSROOT)/usr/include/ncurses +LDFLAGS_NCURSES = -Wl,--as-needed -lpanelw -lncursesw -Wl,--no-as-needed + +CFLAGS_SQLITE = -I$(SYSROOT)/usr/local/include/sqlite3 -I$(SYSROOT)/usr/include/sqlite3 +CFLAGS_SQLITE += -DMODULE_NAME=\"sqlite3\" +CFLAGS_SQLITE += -DSQLITE_OMIT_LOAD_EXTENSION +LDFLAGS_SQLITE = -lsqlite3 + +CFLAGS_EXPAT = -DXML_DEV_URANDOM +LDFLAGS_EXPAT = -lexpat + +CFLAGS_DBM = -DHAVE_NDBM_H +LDFLAGS_DBM = -lgdbm_compat + + +# static extensions: dependency switch +LDFLAGS_PYEXT_STATIC = -lssl -lcrypto -lreadline -lbz2 -lgdbm -lffi -lintl -lz +LDFLAGS_NCURSES_STATIC = $(LDFLAGS_NCURSES) +LDFLAGS_SQLITE_STATIC = $(LDFLAGS_SQLITE) +LDFLAGS_EXPAT_STATIC = $(LDFLAGS_EXPAT) +LDFLAGS_DBM_STATIC = $(LDFLAGS_DBM) + + +# 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 new file mode 100644 index 0000000..04acdb7 --- /dev/null +++ b/config/x86_64-linux/pyconfig.h @@ -0,0 +1,12 @@ +#ifndef PY_PYCONFIG_H +#define PY_PYCONFIG_H + +#include "osapi/modern.h" +#include "osapi/linux.h" +#include "toolchain/64-default.h" +#include "toolchain/64-le-ieee.h" + +/* cf. Modules/posixmodule.c */ +#define HAVE_BROKEN_NICE 1 + +#endif -- cgit v1.2.3