mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-15 04:51:19 +02:00
create bsd12 branch
This commit is contained in:
ziggi
@@ -0,0 +1,41 @@
|
||||
From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001
|
||||
From: Brendan Molloy <brendan@bbqsrc.net>
|
||||
Date: Mon, 4 Jan 2016 23:14:06 +1100
|
||||
Subject: [PATCH] Check bytecode file actually exists and tests
|
||||
|
||||
Should solve issue 20397, where using the --record argument results
|
||||
in files that failed to generate bytecode files are added to the
|
||||
record file nonetheless.
|
||||
---
|
||||
Lib/distutils/command/install_lib.py | 17 +++++++++++++----
|
||||
Lib/distutils/tests/test_install_lib.py | 8 ++++++--
|
||||
2 files changed, 19 insertions(+), 6 deletions(-)
|
||||
|
||||
--- Lib/distutils/command/install_lib.py.orig 2015-12-07 01:39:07 UTC
|
||||
+++ Lib/distutils/command/install_lib.py
|
||||
@@ -164,12 +164,21 @@ class install_lib(Command):
|
||||
ext = os.path.splitext(os.path.normcase(py_file))[1]
|
||||
if ext != PYTHON_SOURCE_EXTENSION:
|
||||
continue
|
||||
+
|
||||
if self.compile:
|
||||
- bytecode_files.append(importlib.util.cache_from_source(
|
||||
- py_file, optimization=''))
|
||||
+ candidate = importlib.util.cache_from_source(
|
||||
+ py_file, optimization='')
|
||||
+
|
||||
+ if os.path.isfile(candidate):
|
||||
+ bytecode_files.append(candidate)
|
||||
+
|
||||
if self.optimize > 0:
|
||||
- bytecode_files.append(importlib.util.cache_from_source(
|
||||
- py_file, optimization=self.optimize))
|
||||
+ candidate = importlib.util.cache_from_source(
|
||||
+ py_file, optimization=self.optimize)
|
||||
+
|
||||
+ if os.path.isfile(candidate):
|
||||
+ bytecode_files.append(candidate)
|
||||
+
|
||||
|
||||
return bytecode_files
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001
|
||||
From: Brendan Molloy <brendan@bbqsrc.net>
|
||||
Date: Mon, 4 Jan 2016 23:14:06 +1100
|
||||
Subject: [PATCH] Check bytecode file actually exists and tests
|
||||
|
||||
Should solve issue 20397, where using the --record argument results
|
||||
in files that failed to generate bytecode files are added to the
|
||||
record file nonetheless.
|
||||
---
|
||||
Lib/distutils/command/install_lib.py | 17 +++++++++++++----
|
||||
Lib/distutils/tests/test_install_lib.py | 8 ++++++--
|
||||
2 files changed, 19 insertions(+), 6 deletions(-)
|
||||
|
||||
--- Lib/distutils/tests/test_install_lib.py.orig 2015-12-07 01:39:07 UTC
|
||||
+++ Lib/distutils/tests/test_install_lib.py
|
||||
@@ -64,11 +64,15 @@ class InstallLibTestCase(support.Tempdir
|
||||
cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
|
||||
cmd.distribution.packages = ['spam']
|
||||
cmd.distribution.script_name = 'setup.py'
|
||||
+
|
||||
+ # Create rubbish, uncompilable file
|
||||
+ f = os.path.join(project_dir, 'spam', 'rubbish.py')
|
||||
+ self.write_file(f, 'rubbish()')
|
||||
|
||||
# get_outputs should return 4 elements: spam/__init__.py and .pyc,
|
||||
- # foo.import-tag-abiflags.so / foo.pyd
|
||||
+ # foo.import-tag-abiflags.so / foo.pyd and rubbish.py (no .pyc)
|
||||
outputs = cmd.get_outputs()
|
||||
- self.assertEqual(len(outputs), 4, outputs)
|
||||
+ self.assertEqual(len(outputs), 5, outputs)
|
||||
|
||||
def test_get_inputs(self):
|
||||
project_dir, dist = self.create_dist()
|
||||
65
lang/python38/files/patch-Makefile.pre.in
Normal file
65
lang/python38/files/patch-Makefile.pre.in
Normal file
@@ -0,0 +1,65 @@
|
||||
# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_*
|
||||
# Submitted by: koobs (r326729)
|
||||
# TODO: Upstream
|
||||
--- Makefile.pre.in.orig 2019-11-04 01:16:37 UTC
|
||||
+++ Makefile.pre.in
|
||||
@@ -80,7 +80,6 @@ MAKESETUP= $(srcdir)/Modules/makesetup
|
||||
OPT= @OPT@
|
||||
BASECFLAGS= @BASECFLAGS@
|
||||
BASECPPFLAGS= @BASECPPFLAGS@
|
||||
-CONFIGURE_CFLAGS= @CFLAGS@
|
||||
# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
|
||||
# Use it when a compiler flag should _not_ be part of the distutils CFLAGS
|
||||
# once Python is installed (Issue #21121).
|
||||
@@ -89,18 +88,16 @@ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
|
||||
# Use it when a linker flag should _not_ be part of the distutils LDFLAGS
|
||||
# once Python is installed (bpo-35257)
|
||||
CONFIGURE_LDFLAGS_NODIST=@LDFLAGS_NODIST@
|
||||
-CONFIGURE_CPPFLAGS= @CPPFLAGS@
|
||||
-CONFIGURE_LDFLAGS= @LDFLAGS@
|
||||
# Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
|
||||
# command line to append to these values without stomping the pre-set
|
||||
# values.
|
||||
-PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
||||
+PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
|
||||
PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) -I$(srcdir)/Include/internal
|
||||
# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
|
||||
# be able to build extension modules using the directories specified in the
|
||||
# environment variables
|
||||
-PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
|
||||
-PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
|
||||
+PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS)
|
||||
+PY_LDFLAGS= $(LDFLAGS)
|
||||
PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
|
||||
NO_AS_NEEDED= @NO_AS_NEEDED@
|
||||
SGI_ABI= @SGI_ABI@
|
||||
@@ -1269,14 +1266,6 @@ bininstall: altbininstall
|
||||
else true; \
|
||||
fi
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
|
||||
- -if test "$(VERSION)" != "$(LDVERSION)"; then \
|
||||
- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
|
||||
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
|
||||
- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
|
||||
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
|
||||
- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
|
||||
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
|
||||
- fi
|
||||
-rm -f $(DESTDIR)$(BINDIR)/python3-config
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
|
||||
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
|
||||
@@ -1580,6 +1569,14 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
||||
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
|
||||
$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
|
||||
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
|
||||
+ -if test "$(VERSION)" != "$(LDVERSION)"; then \
|
||||
+ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
|
||||
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
|
||||
+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
|
||||
+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
|
||||
+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
|
||||
+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
|
||||
+ fi
|
||||
@if [ -s Modules/python.exp -a \
|
||||
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
|
||||
echo; echo "Installing support files for building shared extension modules on AIX:"; \
|
||||
11
lang/python38/files/patch-Misc__python-config.sh.in
Normal file
11
lang/python38/files/patch-Misc__python-config.sh.in
Normal file
@@ -0,0 +1,11 @@
|
||||
--- Misc/python-config.sh.in.orig 2018-07-13 21:07:16 UTC
|
||||
+++ Misc/python-config.sh.in
|
||||
@@ -15,7 +15,7 @@ fi
|
||||
# Returns the actual prefix where this script was installed to.
|
||||
installed_prefix ()
|
||||
{
|
||||
- RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
|
||||
+ RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P))
|
||||
if which readlink >/dev/null 2>&1 ; then
|
||||
if readlink -f "$RESULT" >/dev/null 2>&1; then
|
||||
RESULT=$(readlink -f "$RESULT")
|
||||
25
lang/python38/files/patch-Modules___posixsubprocess.c
Normal file
25
lang/python38/files/patch-Modules___posixsubprocess.c
Normal file
@@ -0,0 +1,25 @@
|
||||
# Add closefrom(2) support
|
||||
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
|
||||
# https://bugs.python.org/issue38061
|
||||
# TODO: Upstream
|
||||
|
||||
--- Modules/_posixsubprocess.c.orig 2019-10-14 13:34:47 UTC
|
||||
+++ Modules/_posixsubprocess.c
|
||||
@@ -236,8 +236,15 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_
|
||||
start_fd = keep_fd + 1;
|
||||
}
|
||||
if (start_fd <= end_fd) {
|
||||
- for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
|
||||
- close(fd_num);
|
||||
+#if defined(__FreeBSD__)
|
||||
+ if (end_fd >= sysconf(_SC_OPEN_MAX)) {
|
||||
+ closefrom(start_fd);
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
+ for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
|
||||
+ close(fd_num);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
26
lang/python38/files/patch-Modules_posixmodule.c
Normal file
26
lang/python38/files/patch-Modules_posixmodule.c
Normal file
@@ -0,0 +1,26 @@
|
||||
# Add closefrom(2) support
|
||||
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
|
||||
# https://bugs.python.org/issue38061
|
||||
# TODO: Upstream
|
||||
|
||||
--- Modules/posixmodule.c.orig 2019-10-14 13:34:47 UTC
|
||||
+++ Modules/posixmodule.c
|
||||
@@ -8460,8 +8460,16 @@ os_closerange_impl(PyObject *module, int fd_low, int f
|
||||
lohi[1] = fd_high;
|
||||
fdwalk(_fdwalk_close_func, lohi);
|
||||
#else
|
||||
- for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
|
||||
- close(i);
|
||||
+ fd_low = Py_MAX(fd_low, 0);
|
||||
+#ifdef __FreeBSD__
|
||||
+ if (fd_high >= sysconf(_SC_OPEN_MAX)) {
|
||||
+ closefrom(fd_low);
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
+ for (i = fd_low; i < fd_high; i++)
|
||||
+ close(i);
|
||||
+ }
|
||||
#endif
|
||||
_Py_END_SUPPRESS_IPH
|
||||
Py_END_ALLOW_THREADS
|
||||
12
lang/python38/files/pkg-message.in
Normal file
12
lang/python38/files/pkg-message.in
Normal file
@@ -0,0 +1,12 @@
|
||||
[
|
||||
{ type: install
|
||||
message: <<EOM
|
||||
Note that some standard Python modules are provided as separate ports
|
||||
as they require additional dependencies. They are available as:
|
||||
|
||||
py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%%
|
||||
py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%%
|
||||
py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%%
|
||||
EOM
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user