Changeset 14023


Ignorieren:
Zeitstempel:
09.01.2017 23:04:25 (vor 4 Monaten)
Autor:
er13
Nachricht:

subversion:

  • drop support for subversion-1.7.x
Ort:
trunk
Dateien:
1 gelöscht
3 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14022 r14023  
    179179    * strace 4.8 
    180180    * stunnel 5.39 
    181     * subversion 1.7.22/1.8.17/1.9.5 
     181    * subversion 1.8.17/1.9.5 
    182182    * tinc 1.0.28 
    183183    * tinyproxy 1.8.3 
  • trunk/make/subversion/Config.in

    r13987 r14023  
    99    select FREETZ_LIB_libapr                      if !FREETZ_PACKAGE_SUBVERSION_STATIC 
    1010    select FREETZ_LIB_libaprutil                  if !FREETZ_PACKAGE_SUBVERSION_STATIC 
    11     select FREETZ_LIB_libneon                     if FREETZ_PACKAGE_SUBVERSION_VERSION_1_7 && !FREETZ_PACKAGE_SUBVERSION_STATIC 
    12     select FREETZ_LIB_libneon_WITH_ZLIB           if FREETZ_PACKAGE_SUBVERSION_VERSION_1_7 
    13     select FREETZ_LIB_libserf                     if (FREETZ_PACKAGE_SUBVERSION_VERSION_1_8 || FREETZ_PACKAGE_SUBVERSION_VERSION_1_9) && !FREETZ_PACKAGE_SUBVERSION_STATIC 
    14     select FREETZ_PACKAGE_SUBVERSION_WITH_SSL     if (FREETZ_PACKAGE_SUBVERSION_VERSION_1_8 || FREETZ_PACKAGE_SUBVERSION_VERSION_1_9) 
     11    select FREETZ_LIB_libserf                     if !FREETZ_PACKAGE_SUBVERSION_STATIC 
    1512    select FREETZ_LIB_libsqlite3                  if !FREETZ_PACKAGE_SUBVERSION_STATIC 
    1613    select FREETZ_LIB_libz                        if !FREETZ_PACKAGE_SUBVERSION_STATIC 
     14    select FREETZ_OPENSSL_VERSION_PROMPT 
    1715    default n 
    1816    help 
     
    2927    default FREETZ_PACKAGE_SUBVERSION_VERSION_1_8 
    3028 
    31     config FREETZ_PACKAGE_SUBVERSION_VERSION_1_7 
    32         bool "1.7.22" 
    33  
    3429    config FREETZ_PACKAGE_SUBVERSION_VERSION_1_8 
    3530        bool "1.8.17" 
    3631 
    3732    config FREETZ_PACKAGE_SUBVERSION_VERSION_1_9 
    38         bool "1.9.5 - EXPERIMENTAL" 
     33        bool "1.9.5" 
    3934        depends on FREETZ_SHOW_ADVANCED 
    4035endchoice 
    41  
    42 config FREETZ_PACKAGE_SUBVERSION_WITH_SSL 
    43     bool "build with SSL support" 
    44     depends on FREETZ_PACKAGE_SUBVERSION 
    45     select FREETZ_LIB_libneon_WITH_SSL if FREETZ_PACKAGE_SUBVERSION_VERSION_1_7 
    46     select FREETZ_OPENSSL_VERSION_PROMPT 
    47     default y 
    48     help 
    49         Enables ssl support in subversion. 
    5036 
    5137config FREETZ_PACKAGE_SUBVERSION_WITH_LIBDB 
  • trunk/make/subversion/subversion.mk

    r13987 r14023  
    1 $(call PKG_INIT_BIN,$(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9),1.9.5,$(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_8),1.8.17,1.7.22))) 
     1$(call PKG_INIT_BIN,$(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9),1.9.5,1.8.17)) 
    22$(PKG)_MAJOR_VERSION:=1 
    33$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2 
    4 $(PKG)_SOURCE_SHA1_1.7.22:=6b883a0e970262f6485fc20fef68a2afcffe0875 
    54$(PKG)_SOURCE_SHA1_1.8.17:=0999f5e16b146f824b952a5552826b9cb5c47b13 
    65$(PKG)_SOURCE_SHA1_1.9.5 :=8bd6a44a1aed30c4c6b6b068488dafb44eaa6adf 
     
    2019 
    2120# Libraries 
    22 $(PKG)_LIBNAMES_SHORT := client delta diff fs fs_fs fs_util ra ra_local ra_svn repos subr wc 
    23 $(PKG)_LIBNAMES_SHORT += $(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_7),ra_neon) 
    24 $(PKG)_LIBNAMES_SHORT += $(if $(or $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_8),$(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9)),ra_serf) 
     21$(PKG)_LIBNAMES_SHORT := client delta diff fs fs_fs fs_util ra ra_local ra_serf ra_svn repos subr wc 
    2522$(PKG)_LIBNAMES_SHORT += $(if $(FREETZ_PACKAGE_SUBVERSION_WITH_LIBDB),fs_base) 
    2623$(PKG)_LIBNAMES_SHORT += $(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9),fs_x) 
     
    4744$(PKG)_DEPENDS_ON += apr-util 
    4845$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_SUBVERSION_WITH_LIBDB),db) 
    49 $(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_7),neon) 
    50 $(PKG)_DEPENDS_ON += $(if $(or $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_8),$(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9)),serf) 
     46$(PKG)_DEPENDS_ON += serf 
    5147$(PKG)_DEPENDS_ON += sqlite 
    5248$(PKG)_DEPENDS_ON += zlib 
     
    5551endif 
    5652 
    57 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_VERSION_1_7 
    5853$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_VERSION_1_8 
    5954$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_VERSION_1_9 
    60 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_WITH_SSL 
    61 ifeq ($(strip $(FREETZ_PACKAGE_SUBVERSION_WITH_SSL)),y) 
    6255$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION 
    63 endif 
    6456$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_WITH_LIBDB 
    6557$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SUBVERSION_STATIC 
     
    7062$(PKG)_CONFIGURE_OPTIONS += --with-apr="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apr-1-config" 
    7163$(PKG)_CONFIGURE_OPTIONS += --with-apr-util="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apu-1-config" 
    72 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_7),--with-neon="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr" --disable-neon-version-check) 
    73 $(PKG)_CONFIGURE_OPTIONS += $(if $(or $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_8),$(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9)),--with-serf="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr",--with-serf=no) 
     64$(PKG)_CONFIGURE_OPTIONS += --with-serf="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr" 
    7465$(PKG)_CONFIGURE_OPTIONS += --with-zlib="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr" 
    7566 
     
    111102    $(SUBMAKE1) -C $(SUBVERSION_DIR) \ 
    112103        DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr" \ 
    113         install $(if $(or $(FREETZ_PACKAGE_SUBVERSION_VERSION_1_8),$(FREETZ_PACKAGE_SUBVERSION_VERSION_1_9)),install-tools install-mods-shared) 
     104        install install-tools install-mods-shared 
    114105    $(PKG_FIX_LIBTOOL_LA) \ 
    115106        $(SUBVERSION_LIBNAMES_LONG:%=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/%.la) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.