28c23ce8db
* configure.ac: Remove definition and substitution of LIBGPGMEPP_LT_CURRENT, LIBGPGMEPP_LT_AGE, LIBGPGMEPP_LT_REVISION. Remove "cpp" from available_languages and from default_languages. Remove checks for C++ 11 and for support of visibility attribute. Remove substitution of GPGME_CPP_CFLAGS. Remove definition and substitution of GPGMEPP_PKGCONFIG_LIBS, GPGMEPP_PKGCONFIG_CFLAGS, GPGMEPP_PKGCONFIG_HOST. Remove generation of files in lang/cpp. * lang/Makefile.am (DIST_SUBDIRS): Remove cpp. * lang/cpp/.gitignore, lang/cpp/AUTHORS, lang/cpp/COPYING, lang/cpp/COPYING.LESSER, lang/cpp/COPYING.LIB, lang/cpp/ChangeLog, lang/cpp/INSTALL, lang/cpp/NEWS, lang/cpp/autogen.rc, lang/cpp/autogen.sh, lang/cpp/configure.ac: New. * lang/cpp/Makefile.am (EXTRA_DIST): Add autogen.sh, autogen.rc, VERSION. (RELEASE_ARCHIVE_SUFFIX, ACLOCAL_AMFLAGS, dist-hook, distcheck-hook, .PHONY, gen_start_date, gen-ChangeLog, RELEASE_NAME, release, sign-release): New (copied from top-level Makefile.am). * lang/cpp/build-aux/compile, lang/cpp/build-aux/config.guess, lang/cpp/build-aux/config.sub, lang/cpp/build-aux/depcomp, lang/cpp/build-aux/install-sh, lang/cpp/build-aux/libtool-patch.sed, lang/cpp/build-aux/ltmain.sh, lang/cpp/build-aux/missing: New. * m4/ax_cxx_compile_stdcxx.m4: Move to... * lang/cpp/m4/ax_cxx_compile_stdcxx.m4: ...here. * m4/ax_gcc_func_attribute.m4: Move to... * lang/cpp/m4/ax_gcc_func_attribute.m4: ...here. * lang/cpp/m4/gpg-error.m4, lang/cpp/m4/gpgme.m4, lang/cpp/m4/libtool.m4, lang/cpp/m4/ltoptions.m4, lang/cpp/m4/ltsugar.m4, lang/cpp/m4/ltversion.m4, lang/cpp/m4/lt~obsolete.m4: New. * lang/cpp/src/GpgmeppConfig-w32.cmake.in.in, lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove @LIBASSUAN_LIBS@ from INTERFACE_LINK_LIBRARIES of Gpgmepp target. * lang/cpp/src/Makefile.am (AM_CPPFLAGS): Replace include paths of gpgme relative to top_builddir with @GPGME_CFLAGS@. Remove @LIBASSUAN_CFLAGS@. (libgpgmepp_la_LIBADD): Replace relative paths of libgpgme.la with @GPGME_LIBS@. Remove @LIBASSUAN_LIBS@. * lang/cpp/tests/Makefile.am (LDADD): Replace relative paths of libgpgme.la with @GPGME_LIBS@. (AM_CPPFLAGS): Replace include paths of gpgme relative to top_builddir with @GPGME_CFLAGS@. Remove @LIBASSUAN_CFLAGS@. Remove -DTOP_SRCDIR. -- This makes building and distributing GpgME++ independent of the sources of gpgme. Many of the new files are copied from gpgme to make GpgME++ a self-contained package. A later commit re-adds the possibility to build GpgME++ as nested package together with gpgme. GnuPG-bug-id: 7110
69 lines
1.5 KiB
Sed
69 lines
1.5 KiB
Sed
#
|
|
# This is a sed script to patch the generated libtool,
|
|
# which works well against both of libtool 2.4.2 and 2.4.7.
|
|
#
|
|
# You may use this work under the terms of a Creative Commons CC0 1.0
|
|
# License/Waiver.
|
|
#
|
|
# CC0 Public Domain Dedication
|
|
# https://creativecommons.org/publicdomain/zero/1.0/
|
|
|
|
#
|
|
# This sed script applys two hunks of the patch:
|
|
#
|
|
# Part1: after the comment "# bleh windows"
|
|
# Part2: after the comment "#extension on DOS 8.3..."
|
|
#
|
|
# Only when those two parts are patched correctly, it exits with 0 or
|
|
# else, it exits with 1
|
|
#
|
|
|
|
# Find the part 1, by the comment
|
|
/^[ \t]*# bleh windows$/b part1_start
|
|
# Not found the part1, raise an error
|
|
$ q1
|
|
b
|
|
|
|
:part1_start
|
|
n
|
|
# The first line in the part 1 must be the begining of the case statement.
|
|
/^[ \t]*case \$host in$/! q1
|
|
n
|
|
# Insert the entry for x86_64-*mingw32*, for modified versuffix.
|
|
i\
|
|
x86_64-*mingw32*)
|
|
i\
|
|
func_arith $current - $age
|
|
i\
|
|
major=$func_arith_result
|
|
i\
|
|
versuffix="6-$major"
|
|
i\
|
|
;;
|
|
:part1_0
|
|
# Find the end of the case statement
|
|
/^[ \t]*esac$/b find_part2
|
|
# Not found the end of the case statement, raise an error
|
|
$ q1
|
|
n
|
|
b part1_0
|
|
|
|
:find_part2
|
|
/^[ \t]*# extension on DOS 8.3 file.*systems.$/b part2_process
|
|
# Not found the part2, raise an error
|
|
$ q1
|
|
n
|
|
b find_part2
|
|
|
|
:part2_process
|
|
$ q1
|
|
s/^[ \t]*\(versuffix=\)\(.*\)\(-$major\)\(.*\)$/\t case \$host in\n\t x86_64-*mingw32*)\n\t \1\26\3\4\n\t ;;\n\t *)\n\t \1\2\3\4\n\t ;;\n\t esac/
|
|
t part2_done
|
|
n
|
|
b part2_process
|
|
|
|
:part2_done
|
|
$ q0
|
|
n
|
|
b part2_done
|