| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* configure.ac: Generate gpgrt-config from gpgrt-config.in.
* src/gpgrt-config.in: Rename from src/gpg-error-config-new.in.
* src/Makefile.am (bin_SCRIPTS): Add gpgrt-config.
(EXTRA_DIST): Add gpgrt-config.in removing gpg-error-config-new.in.
(BUILT_SOURCES, CLEANFILES): Remove gpgrt-config.
(gpg-error-config): Always copy from gpg-error-config-old.
* src/gpg-error-config-test.sh: Follow the rename.
--
The gpgrt-config script is new implementation supporting *.pc file,
while gpg-error-config keeps old single shell script.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in: Only get it from the first.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* configure.ac: Fix regexp matching multiarch environment.
* src/gpg-error-config-new.in: Support standard cross build.
Handle the case where $multiarch != $triplet.
--
For standard cross build, use @exec_prefix@/$triplet/lib/pkgconfig.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* configure.ac (pkg_config_libdir): Set it "auto" when it looks
multiarch environment.
* src/gpg-error-config-new.in: Automatically detects the triplet.
--
The triplet detection mechanism is not sufficient. It's up to
distributions to apply more changes (in distribution specific way).
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* configure.ac (pkg_config_libdir): New.
* src/gpg-error-config-new.in: Use pkg_config_libdir.
--
PKG_CONFIG_LIBDIR is not mere libdir but should include
'pkgconfig'.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in: Use PKG_CONFIG_LIBDIR if specified.
--
This change allows a distribution (like Debian) offering
<triplet>-gpg-error-config wrapper script which invokes
gpg-error-config with host specific PKG_CONFIG_LIBDIR.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* src/Makefile.am (pkgconfigdir): It should be under libdir.
* src/gpg-error-config-new.in: Likewise.
--
Reported-by: Alon Bar-Lev <[email protected]>
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in (sysroot): New function.
(want_cflags, want_libs): Use sysroot.
* src/gpg-error-config-test.sh: Test with PKG_CONFIG_SYSROOT_DIR.
--
PKG_CONFIG_SYSROOT_DIR is for cross build.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in (remove_var_expr): Use expr.
--
For OpenBSD's sh, it results "bad substitusion". Now, we use expr.
Tested on OpenBSD 6.2.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in (module_list): Rename from modules.
--
For ZSH, "modules" is built-in variable name. Avoid such a use.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in: Use global variables only.
--
Since Korn Shell requires different syntax for function to declare
local variables, and some OS use Korn Shell as /bin/sh, avoid
non-portable use of "local".
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
| |
* src/gpg-error-config-new.in: Don't put more space.
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
* configure.ac (AC_CONFIG_FILES): Generate src/gpg-error.pc, as well
as src/gpg-error-config-old and src/gpg-error-config-new.
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
(EXTRA_DIST): Add gpg-error-config-new.in, gpg-error-config-test.sh,
and gpg-error.pc.in.
(CLEANFILES): Add gpg-error-config gpg-error-config-test.log.
(TESTS): New.
(gpg-error-config): New target.
* src/gpg-error-config-new.in: New.
* src/gpg-error-config-test.sh: New.
* src/gpg-error.pc.in: New.
* src/gpg-error.m4 (GPG_ERROR_MT_CFLAGS): Use --variable.
(GPG_ERROR_MT_LIBS, gpg_error_config_host): Likewise.
--
This change is to privide gpg-error.pc for pkg-config, so that
developers can use pkg-config to configure their applications. The
gpg-error-config script is also kept supported for applications which
want to avoid dependency of pkg-config.
Note that new gpg-error-config script uses gpg-error.pc as master
data, so that it can keep compatibility to pkg-config easily. In the
new gpg-error-config script, features are added to increase
compatibility to pkg-config, like --variable option and multiple
module support. However, it is not meant to oriented to be a
full-fledged version of pkg-config, only a small set of features is
supported.
To be conservative, new gpg-error-config is checked at build time
against old gpg-error-config. On the host which fails, old
gpg-error-config will be installed with a warning.
GnuPG-bug-id: 4085
Signed-off-by: NIIBE Yutaka <[email protected]>
|