24d0704fa4
In other external projects using libtool, we fix that by patching configure, resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block that sets the Linux-specific value. But here we run autoreconf in ExternalProject_libassuan, so that patch in configure would be overwritten. The relevant code in configure comes from autoconf boilerplate, so we cannot just do the same patch in configure.ac. But we can reset hardcode_libdir_flag_spec sufficiently late in configure.ac so that things still work as intended. Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa Reviewed-on: https://gerrit.libreoffice.org/50959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
24 lines
903 B
Makefile
24 lines
903 B
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_UnpackedTarball_UnpackedTarball,libassuan))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,libassuan,$(LIBASSUAN_TARBALL)))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
|
|
external/libassuan/find-libgpg-error.patch \
|
|
external/libassuan/fix-autoconf-macros.patch \
|
|
$(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
|
|
external/libassuan/w32-build-fixes-2.patch \
|
|
$(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|