mirror of
https://git.freebsd.org/ports.git
synced 2025-07-01 01:20:31 -04:00
41a721e0f7
- Although this port perfectly builds fine with OpenSSL 3 however there are some routine calls which makes other ports dependent on this failing with errors. One such occurance is devel/py-subversion. This patch fixes this issue. - Refresh patches - Bump PORTREVISION as this needs to be rebuilt for 14 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation
49 lines
1.9 KiB
Text
49 lines
1.9 KiB
Text
--- SConstruct.orig 2023-08-18 19:57:03 UTC
|
|
+++ SConstruct
|
|
@@ -76,6 +76,9 @@ else:
|
|
|
|
opts = Variables(files=[SAVED_CONFIG])
|
|
opts.AddVariables(
|
|
+ RawListVariable('DESTDIR',
|
|
+ 'Required *dummy*, without scons will stop with "Unknown variables: DESTDIR"',
|
|
+ None),
|
|
PathVariable('PREFIX',
|
|
'Directory to install under',
|
|
default_prefix,
|
|
@@ -210,6 +213,7 @@ opts.Save(SAVED_CONFIG, env)
|
|
thisdir = os.getcwd()
|
|
libdir = '$LIBDIR'
|
|
incdir = '$PREFIX/include/serf-$MAJOR'
|
|
+pkgconfdir = '$PREFIX/libdata'
|
|
|
|
# This version string is used in the dynamic library name, and for Mac OS X also
|
|
# for the current_version and compatibility_version options in the .dylib
|
|
@@ -366,8 +370,8 @@ else:
|
|
### there is probably a better way to run/capture output.
|
|
### env.ParseConfig() may be handy for getting this stuff into the build
|
|
if CALLOUT_OKAY:
|
|
- apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
|
|
- apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
|
|
+ apr_libs = os.popen(env.subst('$APR --libs')).read().strip()
|
|
+ apu_libs = os.popen(env.subst('$APU --libs')).read().strip()
|
|
else:
|
|
apr_libs = ''
|
|
apu_libs = ''
|
|
@@ -408,6 +412,8 @@ pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
|
|
|
|
env.Default(lib_static, lib_shared, pkgconfig)
|
|
|
|
+#print env.Dump()
|
|
+
|
|
if CALLOUT_OKAY:
|
|
conf = Configure(env)
|
|
|
|
@@ -439,7 +445,7 @@ if sys.platform == 'darwin':
|
|
env.Alias('install-lib', [install_static, install_shared,
|
|
])
|
|
env.Alias('install-inc', env.Install(incdir, HEADER_FILES))
|
|
-env.Alias('install-pc', env.Install(os.path.join(libdir, 'pkgconfig'),
|
|
+env.Alias('install-pc', env.Install(os.path.join(pkgconfdir, 'pkgconfig'),
|
|
pkgconfig))
|
|
env.Alias('install', ['install-lib', 'install-inc', 'install-pc', ])
|
|
|