mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-21 10:09:57 +01:00
build: Remove Windows CE support.
* agent/Makefile.am [HAVE_W32CE_SYSTEM]: Remove. * am/cmacros.am [HAVE_W32CE_SYSTEM]: Remove. * autogen.sh: Remove W32ce_ variables. * configure.ac: Likewise. * dirmngr/Makefile.am (extra_bin_ldflags): Remove. * g10/Makefile.am [HAVE_W32CE_SYSTEM]: Remove. * kbx/Makefile.am: Likewise. * sm/Makefile.am (extra_bin_ldflags): Remove. * tools/Makefile.am (extra_bin_ldflags): Remove. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
parent
278f85d1bc
commit
f32d0c9c0f
@ -19,10 +19,8 @@
|
||||
|
||||
bin_PROGRAMS = gpg-agent
|
||||
libexec_PROGRAMS = gpg-protect-tool
|
||||
if !HAVE_W32CE_SYSTEM
|
||||
# fixme: Do no use simple-pwquery for preset-passphrase.
|
||||
libexec_PROGRAMS += gpg-preset-passphrase
|
||||
endif
|
||||
noinst_PROGRAMS = $(TESTS)
|
||||
|
||||
EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
|
||||
@ -66,11 +64,7 @@ gpg_agent_SOURCES = \
|
||||
|
||||
common_libs = $(libcommon)
|
||||
commonpth_libs = $(libcommonpth)
|
||||
if HAVE_W32CE_SYSTEM
|
||||
pwquery_libs =
|
||||
else
|
||||
pwquery_libs = ../common/libsimple-pwquery.a
|
||||
endif
|
||||
|
||||
|
||||
gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \
|
||||
@ -79,7 +73,7 @@ gpg_agent_LDADD = $(commonpth_libs) \
|
||||
$(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
|
||||
$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
|
||||
$(resource_objs)
|
||||
gpg_agent_LDFLAGS = $(extra_bin_ldflags)
|
||||
gpg_agent_LDFLAGS =
|
||||
gpg_agent_DEPENDENCIES = $(resource_objs)
|
||||
|
||||
gpg_protect_tool_SOURCES = \
|
||||
|
||||
@ -57,19 +57,6 @@ if GNUPG_DIRMNGR_LDAP_PGM
|
||||
AM_CPPFLAGS += -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
|
||||
endif
|
||||
|
||||
# Under Windows we use LockFileEx. WindowsCE provides this only on
|
||||
# the WindowsMobile 6 platform and thus we need to use the coredll6
|
||||
# import library. We also want to use a stacksize of 256k instead of
|
||||
# the 2MB which is the default with cegcc. 256k is the largest stack
|
||||
# we use with pth.
|
||||
if HAVE_W32CE_SYSTEM
|
||||
extra_sys_libs = -lcoredll6
|
||||
extra_bin_ldflags = -Wl,--stack=0x40000
|
||||
else
|
||||
extra_sys_libs =
|
||||
extra_bin_ldflags =
|
||||
endif
|
||||
|
||||
if HAVE_W32_SYSTEM
|
||||
.rc.o:
|
||||
$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
|
||||
|
||||
18
autogen.sh
18
autogen.sh
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# autogen.sh
|
||||
# Copyright (C) 2003, 2014, 2017, 2018 g10 Code GmbH
|
||||
# Copyright (C) 2003, 2014, 2017, 2018, 2022 g10 Code GmbH
|
||||
#
|
||||
# This file is free software; as a special exception the author gives
|
||||
# unlimited permission to copy and/or distribute it, with or without
|
||||
@ -15,7 +15,7 @@
|
||||
# configure it for the respective package. It is maintained as part of
|
||||
# GnuPG and source copied by other packages.
|
||||
#
|
||||
# Version: 2018-02-21
|
||||
# Version: 2022-12-09
|
||||
|
||||
configure_ac="configure.ac"
|
||||
|
||||
@ -137,8 +137,6 @@ extraoptions=
|
||||
# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
|
||||
w32_toolprefixes=
|
||||
w32_extraoptions=
|
||||
w32ce_toolprefixes=
|
||||
w32ce_extraoptions=
|
||||
w64_toolprefixes=
|
||||
w64_extraoptions=
|
||||
amd64_toolprefixes=
|
||||
@ -146,7 +144,6 @@ amd64_toolprefixes=
|
||||
# What follows are variables which are sourced but default to
|
||||
# environment variables or lacking them hardcoded values.
|
||||
#w32root=
|
||||
#w32ce_root=
|
||||
#w64root=
|
||||
#amd64root=
|
||||
|
||||
@ -163,11 +160,6 @@ case "$1" in
|
||||
myhost="w32"
|
||||
shift
|
||||
;;
|
||||
--build-w32ce)
|
||||
myhost="w32"
|
||||
myhostsub="ce"
|
||||
shift
|
||||
;;
|
||||
--build-w64)
|
||||
myhost="w32"
|
||||
myhostsub="64"
|
||||
@ -274,12 +266,6 @@ fi
|
||||
# ******************
|
||||
if [ "$myhost" = "w32" ]; then
|
||||
case $myhostsub in
|
||||
ce)
|
||||
w32root="$w32ce_root"
|
||||
[ -z "$w32root" ] && w32root="$HOME/w32ce_root"
|
||||
toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
|
||||
extraoptions="$extraoptions $w32ce_extraoptions"
|
||||
;;
|
||||
64)
|
||||
w32root="$w64root"
|
||||
[ -z "$w32root" ] && w32root="$HOME/w64root"
|
||||
|
||||
32
configure.ac
32
configure.ac
@ -691,7 +691,6 @@ try_gettext=yes
|
||||
require_iconv=yes
|
||||
have_dosish_system=no
|
||||
have_w32_system=no
|
||||
have_w32ce_system=no
|
||||
have_android_system=no
|
||||
use_simple_gettext=no
|
||||
mmap_needed=yes
|
||||
@ -710,15 +709,7 @@ case "${host}" in
|
||||
have_w32_system=yes
|
||||
require_iconv=no
|
||||
require_pipe_to_unblock_pselect=no
|
||||
case "${host}" in
|
||||
*-mingw32ce*)
|
||||
have_w32ce_system=yes
|
||||
;;
|
||||
*)
|
||||
AC_DEFINE(HAVE_DRIVE_LETTERS,1,
|
||||
[Defined if the OS supports drive letters.])
|
||||
;;
|
||||
esac
|
||||
AC_DEFINE(HAVE_DRIVE_LETTERS,1, [Defined if the OS supports drive letters.])
|
||||
try_gettext="no"
|
||||
use_simple_gettext=yes
|
||||
mmap_needed=no
|
||||
@ -803,13 +794,9 @@ AM_CONDITIONAL(USE_SIMPLE_GETTEXT, test x"$use_simple_gettext" = xyes)
|
||||
|
||||
if test "$have_w32_system" = yes; then
|
||||
AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
|
||||
if test "$have_w32ce_system" = yes; then
|
||||
AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
|
||||
fi
|
||||
AC_CHECK_HEADERS([winsock2.h])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
|
||||
AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
|
||||
|
||||
if test "$have_android_system" = yes; then
|
||||
AC_DEFINE(HAVE_ANDROID_SYSTEM,1, [Defined if we build for an Android system])
|
||||
@ -1273,9 +1260,6 @@ AC_DEFINE_UNQUOTED(NAME_OF_SENDMAIL,"$SENDMAIL",
|
||||
# Construct a printable name of the OS
|
||||
#
|
||||
case "${host}" in
|
||||
*-mingw32ce*)
|
||||
PRINTABLE_OS_NAME="W32CE"
|
||||
;;
|
||||
*-mingw32*)
|
||||
PRINTABLE_OS_NAME="MingW32"
|
||||
;;
|
||||
@ -1575,11 +1559,7 @@ GNUPG_CHECK_GNUMAKE
|
||||
# requiring any network stuff but linking to code in libcommon which
|
||||
# tracks in winsock stuff (e.g. init_common_subsystems).
|
||||
if test "$have_w32_system" = yes; then
|
||||
if test "$have_w32ce_system" = yes; then
|
||||
W32SOCKLIBS="-lws2"
|
||||
else
|
||||
W32SOCKLIBS="-lws2_32"
|
||||
fi
|
||||
NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
|
||||
fi
|
||||
|
||||
@ -2064,16 +2044,6 @@ if test "$have_ksba" = "no"; then
|
||||
*** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
|
||||
***]])
|
||||
fi
|
||||
if test "$gnupg_have_ldap" = yes; then
|
||||
if test "$have_w32ce_system" = yes; then
|
||||
AC_MSG_NOTICE([[
|
||||
*** Note that CeGCC might be broken, a package fixing this is:
|
||||
*** http://files.kolab.org/local/windows-ce/
|
||||
*** source/wldap32_0.1-mingw32ce.orig.tar.gz
|
||||
*** binary/wldap32-ce-arm-dev_0.1-1_all.deb
|
||||
***]])
|
||||
fi
|
||||
fi
|
||||
if test "$have_npth" = "no"; then
|
||||
die=yes
|
||||
AC_MSG_NOTICE([[
|
||||
|
||||
@ -93,7 +93,7 @@ dirmngr_LDADD = $(libcommonpth) \
|
||||
if USE_LDAP
|
||||
dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
|
||||
endif
|
||||
dirmngr_LDFLAGS = $(extra_bin_ldflags)
|
||||
dirmngr_LDFLAGS =
|
||||
|
||||
if USE_LDAP
|
||||
dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
|
||||
@ -108,7 +108,7 @@ dirmngr_client_SOURCES = dirmngr-client.c
|
||||
dirmngr_client_LDADD = $(libcommon) \
|
||||
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
|
||||
dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
|
||||
dirmngr_client_LDFLAGS =
|
||||
|
||||
|
||||
t_common_src = t-support.h t-support.c
|
||||
|
||||
@ -47,9 +47,7 @@ endif
|
||||
# NB: We use noinst_ for gpg and gpgv so that we can install them with
|
||||
# the install-hook target under the name gpg2/gpgv2.
|
||||
noinst_PROGRAMS = gpg
|
||||
if !HAVE_W32CE_SYSTEM
|
||||
noinst_PROGRAMS += gpgv
|
||||
endif
|
||||
noinst_PROGRAMS += $(module_tests)
|
||||
if DISABLE_TESTS
|
||||
TESTS =
|
||||
@ -173,12 +171,12 @@ LDADD = $(needed_libs) ../common/libgpgrl.a \
|
||||
$(ZLIBS) $(LIBINTL) $(CAPLIBS)
|
||||
gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
|
||||
$(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||
$(LIBICONV) $(resource_objs) $(extra_sys_libs)
|
||||
gpg_LDFLAGS = $(extra_bin_ldflags)
|
||||
$(LIBICONV) $(resource_objs)
|
||||
gpg_LDFLAGS =
|
||||
gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
|
||||
$(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||
$(LIBICONV) $(resource_objs) $(extra_sys_libs)
|
||||
gpgv_LDFLAGS = $(extra_bin_ldflags)
|
||||
$(LIBICONV) $(resource_objs)
|
||||
gpgv_LDFLAGS =
|
||||
|
||||
|
||||
t_common_ldadd =
|
||||
|
||||
@ -37,12 +37,6 @@ else
|
||||
libexec_PROGRAMS =
|
||||
endif
|
||||
|
||||
if HAVE_W32CE_SYSTEM
|
||||
extra_libs = $(LIBASSUAN_LIBS)
|
||||
else
|
||||
extra_libs =
|
||||
endif
|
||||
|
||||
common_libs = $(libcommon)
|
||||
commonpth_libs = $(libcommonpth)
|
||||
|
||||
@ -75,7 +69,7 @@ libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) -DKEYBOX
|
||||
kbxutil_SOURCES = kbxutil.c $(common_sources)
|
||||
kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
|
||||
kbxutil_LDADD = $(common_libs) \
|
||||
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
|
||||
$(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
|
||||
$(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) \
|
||||
$(NETLIBS)
|
||||
|
||||
@ -98,7 +92,7 @@ keyboxd_LDADD = $(commonpth_libs) \
|
||||
$(SQLITE3_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBINTL) $(NETLIBS) $(LIBICONV) \
|
||||
$(resource_objs)
|
||||
keyboxd_LDFLAGS = $(extra_bin_ldflags)
|
||||
keyboxd_LDFLAGS =
|
||||
keyboxd_DEPENDENCIES = $(resource_objs)
|
||||
|
||||
|
||||
|
||||
@ -70,8 +70,8 @@ common_libs = ../kbx/libkeybox509.a $(libcommonpth)
|
||||
gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
|
||||
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
|
||||
$(NPTH_LIBS) $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
|
||||
$(LIBICONV) $(resource_objs) $(extra_sys_libs) $(NETLIBS)
|
||||
gpgsm_LDFLAGS = $(extra_bin_ldflags)
|
||||
$(LIBICONV) $(resource_objs) $(NETLIBS)
|
||||
gpgsm_LDFLAGS =
|
||||
|
||||
|
||||
module_tests =
|
||||
|
||||
@ -98,7 +98,7 @@ gpgconf_LDADD = $(common_libs) \
|
||||
$(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||
$(LIBICONV) $(W32SOCKLIBS) \
|
||||
$(gpgconf_rc_objs)
|
||||
gpgconf_LDFLAGS = $(extra_bin_ldflags)
|
||||
gpgconf_LDFLAGS =
|
||||
|
||||
gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
|
||||
gpgconf_w32_LDADD = $(gpgconf_LDADD)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user