8fe9ce38dd
Fix build against PHP8 Remove support for EL6 General logic cleanup and removal of dead code from the spec file Add --verbose to build step to show compiler settings
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
diff -uNr a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py
|
|
--- a/plugins/jvm/uwsgiplugin.py 2021-10-06 07:22:45.000000000 +0200
|
|
+++ b/plugins/jvm/uwsgiplugin.py 2022-01-23 10:50:20.403612334 +0100
|
|
@@ -65,11 +65,6 @@
|
|
|
|
GCC_LIST = ['jvm_plugin']
|
|
|
|
-if 'LD_RUN_PATH' in os.environ:
|
|
- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]
|
|
-else:
|
|
- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
|
|
-
|
|
def post_build(config):
|
|
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
|
|
os._exit(1)
|
|
diff -uNr a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
|
|
--- a/plugins/php/uwsgiplugin.py 2021-10-06 07:22:45.000000000 +0200
|
|
+++ b/plugins/php/uwsgiplugin.py 2022-01-23 10:50:20.404612340 +0100
|
|
@@ -19,7 +19,6 @@
|
|
|
|
if ld_run_path:
|
|
LDFLAGS.append('-L%s' % ld_run_path)
|
|
- os.environ['LD_RUN_PATH'] = ld_run_path
|
|
|
|
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version]
|
|
|
|
diff -uNr a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
|
|
--- a/plugins/python/uwsgiplugin.py 2021-10-06 07:22:45.000000000 +0200
|
|
+++ b/plugins/python/uwsgiplugin.py 2022-01-23 10:50:31.286681373 +0100
|
|
@@ -60,9 +60,6 @@
|
|
libdir = "%s/lib" % sysconfig.PREFIX
|
|
|
|
LDFLAGS.append("-L%s" % libdir)
|
|
- LDFLAGS.append("-Wl,-rpath,%s" % libdir)
|
|
-
|
|
- os.environ['LD_RUN_PATH'] = "%s" % libdir
|
|
|
|
LIBS.append('-lpython%s' % get_python_version())
|
|
else:
|
|
diff -uNr a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
|
|
--- a/plugins/rack/uwsgiplugin.py 2021-10-06 07:22:45.000000000 +0200
|
|
+++ b/plugins/rack/uwsgiplugin.py 2022-01-23 10:50:20.408612365 +0100
|
|
@@ -46,7 +46,6 @@
|
|
|
|
if has_shared == 'yes':
|
|
LDFLAGS.append('-L' + libpath )
|
|
- os.environ['LD_RUN_PATH'] = libpath
|
|
LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
|
|
else:
|
|
rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
|
|
diff -uNr a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
|
|
--- a/plugins/ruby19/uwsgiplugin.py 2021-10-06 07:22:45.000000000 +0200
|
|
+++ b/plugins/ruby19/uwsgiplugin.py 2022-01-23 10:50:20.408612365 +0100
|
|
@@ -40,6 +40,5 @@
|
|
|
|
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
|
|
LDFLAGS.append('-L' + libpath )
|
|
-os.environ['LD_RUN_PATH'] = libpath
|
|
LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
|
|
|