From ff12ccdde76c54d3b9e69799a63750db9edf0023 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Apr 2024 00:38:14 +0200 Subject: Revert "Tweak how lzma is linked." This reverts commit 604a5f9343eebfa0108a19bb6b8ec60bc81f4819. I don't know why I did this, and it breaks the mac-old (10.8) target as the lzma.5.dylib is not present on those machines. --- wscript | 1 - 1 file changed, 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index f6f73a52a..e5164cc52 100644 --- a/wscript +++ b/wscript @@ -219,7 +219,6 @@ def configure(conf): if conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION']) conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names') - conf.env.append_value('LINKFLAGS', '-llzma') # # Dependencies. -- cgit v1.2.3 From 04c0c46c73742d325948b35072da501e07b7ba57 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 Apr 2024 22:41:37 +0200 Subject: Don't "pollute" the library path with /usr/local/lib. Sometimes we don't want to use the stuff in there. --- cscript | 2 ++ wscript | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index dd7f9c44a..f7a61b440 100644 --- a/cscript +++ b/cscript @@ -788,6 +788,8 @@ def package_rpm(target, cpu, version, options): make_spec('dcpomatic2.spec', version, target, options, requires) cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir + # On Centos 7 we build and install boost ourselves, so we must look for it in the right place + target.set('LINKFLAGS', '-L/usr/local/lib') target.command(cmd) rpms = [] diff --git a/wscript b/wscript index e5164cc52..3cc5c2f27 100644 --- a/wscript +++ b/wscript @@ -196,7 +196,6 @@ def configure(conf): int main() { std::locale::global (boost::locale::generator().generate ("")); }\n """, msg='Checking for boost locale library', - libpath='/usr/local/lib', lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_LOCALE') @@ -249,7 +248,7 @@ def configure(conf): mandatory=True, msg='Checking for libicu', okmsg='yes', - libpath=['/usr/local/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu'], + libpath=['/usr/lib', '/usr/lib/x86_64-linux-gnu'], lib=['icuio', 'icui18n', 'icudata', 'icuuc'], uselib_store='ICU') @@ -399,7 +398,6 @@ def configure(conf): int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; } """, msg='Checking for libjpeg', - libpath='/usr/local/lib', lib=['jpeg'], uselib_store='JPEG') @@ -410,7 +408,6 @@ def configure(conf): int main() { ext4_mount("ext4_fs", "/mp/", false); }\n """, msg='Checking for lwext4 library', - libpath='/usr/local/lib', lib=['lwext4', 'blockdev'], uselib_store='LWEXT4') @@ -549,7 +546,6 @@ def configure(conf): int main() { boost::thread t; }\n """, msg='Checking for boost threading library', - libpath='/usr/local/lib', lib=[boost_thread, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_THREAD') @@ -558,7 +554,6 @@ def configure(conf): int main() { boost::filesystem::copy_file ("a", "b"); }\n """, msg='Checking for boost filesystem library', - libpath='/usr/local/lib', lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_FILESYSTEM') @@ -567,7 +562,6 @@ def configure(conf): int main() { boost::gregorian::day_clock::local_day(); }\n """, msg='Checking for boost datetime library', - libpath='/usr/local/lib', lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_DATETIME') -- cgit v1.2.3 From 191e92a4babdea589aa9c78fa659b0d8fc97ff82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 27 Apr 2024 17:41:52 +0200 Subject: Use plain git hash for VERSION when there is no exact tag. --- wscript | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 3cc5c2f27..d97a2f97c 100644 --- a/wscript +++ b/wscript @@ -38,17 +38,17 @@ APPNAME = 'dcpomatic' libdcp_version = '1.8.73' libsub_version = '1.6.42' -this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] -last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] +this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0] +git_head = subprocess.Popen(['git', 'rev-parse', '--short=9', 'HEAD'], stdout=subprocess.PIPE).communicate()[0] # Python 2/3 compatibility; I don't really understand what's going on here if not isinstance(this_version, str): this_version = this_version.decode('utf-8') -if not isinstance(last_version, str): - last_version = last_version.decode('utf-8') +if not isinstance(git_head, str): + git_head = git_head.decode('utf-8') -if this_version == '' or this_version == 'merged-to-main': - VERSION = '%sdevel' % last_version[1:].strip() +if this_version == '': + VERSION = git_head.strip() else: VERSION = this_version[1:].strip() -- cgit v1.2.3