diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-12-19 20:54:31 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-12-20 09:13:28 +0100 |
| commit | fc5c81ced846adae2dbaccf78105d47b01d92269 (patch) | |
| tree | 2801d6780f0956a33cadd566a822d3385431f8d7 | |
| parent | ea1a05e43e002444d224fa47e87fc79f921ae10b (diff) | |
argon2: oops, forgot to build static lib with -fPIC
... and Julien Nabet reports that Debian's default shell dash doesn't
have "time", oddly enough.
Change-Id: I82734bdf9e943522471c4c9189fac463bca2a3aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161008
Reviewed-by: René Engelhard <rene@debian.org>
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | external/argon2/ExternalProject_argon2.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/argon2/ExternalProject_argon2.mk b/external/argon2/ExternalProject_argon2.mk index c39fe062813b..7e521096af22 100644 --- a/external/argon2/ExternalProject_argon2.mk +++ b/external/argon2/ExternalProject_argon2.mk @@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,argon2,build): $(gb_MSBUILD_CONFIG_AND_PLATFORM) \ /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ - $(if $(CROSS_COMPILING),,&& time vs2015/build/Argon2OptTestCI.exe) \ + $(if $(CROSS_COMPILING),,&& vs2015/build/Argon2OptTestCI.exe) \ ) $(call gb_Trace_EndRange,argon2,EXTERNAL) @@ -42,10 +42,10 @@ else # $(COM) $(call gb_ExternalProject_get_state_target,argon2,build): $(call gb_Trace_StartRange,argon2,EXTERNAL) $(call gb_ExternalProject_run,build,\ - CFLAGS="$(CFLAGS) $(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden)" \ + CFLAGS="$(CFLAGS) $(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden) -fPIC" \ MAKEFLAGS= $(MAKE) \ OPTTARGET=$(if $(filter X86_64,$(CPUNAME)),x86-64,forcefail) \ - $(if $(CROSS_COMPILING),,&& time $(MAKE) test) \ + $(if $(CROSS_COMPILING),,&& $(MAKE) test) \ ) $(call gb_Trace_EndRange,argon2,EXTERNAL) |