Просмотр исходного кода

update subversion to latest stable version

Waldemar Brodkorb 11 лет назад
Родитель
Сommit
87ffc3578b
2 измененных файлов с 57 добавлено и 3 удалено
  1. 3 3
      package/subversion/Makefile
  2. 54 0
      package/subversion/patches/patch-configure

+ 3 - 3
package/subversion/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 include ${ADK_TOPDIR}/rules.mk
 
 
 PKG_NAME:=		subversion
 PKG_NAME:=		subversion
-PKG_VERSION:=		1.7.18
+PKG_VERSION:=		1.8.13
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		fb1b0b1e89dd01b230dce0a0e9696b52b9f1b4ec0b3b6353ee518ed43a8dd310
+PKG_HASH:=		17e8900a877ac9f0d5ef437c20df437fec4eb2c5cb9882609d2277e2312da52c
 PKG_DESCR:=		revision control program
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		dev/scm
 PKG_SECTION:=		dev/scm
 PKG_DEPENDS:=		zlib apr apr-util libexpat libsqlite neon
 PKG_DEPENDS:=		zlib apr apr-util libexpat libsqlite neon
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--with-apr=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \
 			--disable-javahl \
 			--disable-javahl \
 			--without-berkeley-db
 			--without-berkeley-db
 CONFIGURE_ENV+=		LIBS='-lsqlite3 -laprutil-1 -lapr-1 -lexpat -ltinfo'
 CONFIGURE_ENV+=		LIBS='-lsqlite3 -laprutil-1 -lapr-1 -lexpat -ltinfo'
-INSTALL_TARGET:=	external-install local-install
+#INSTALL_TARGET:=	external-install local-install
 
 
 subversion-install:
 subversion-install:
 	${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib}
 	${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib}

+ 54 - 0
package/subversion/patches/patch-configure

@@ -0,0 +1,54 @@
+--- subversion-1.8.13.orig/configure	2015-03-18 14:33:22.000000000 +0100
++++ subversion-1.8.13/configure	2015-06-10 23:08:29.000000000 +0200
+@@ -18631,51 +18631,6 @@ fi
+ 
+ 
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mach-O dynamic module iteration functions" >&5
+-$as_echo_n "checking for Mach-O dynamic module iteration functions... " >&6; }
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-    #include <mach-o/dyld.h>
+-    #include <mach-o/loader.h>
+-
+-int
+-main ()
+-{
+-
+-    const struct mach_header *header = _dyld_get_image_header(0);
+-    const char *name = _dyld_get_image_name(0);
+-    if (name && header) return 0;
+-    return 1;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-
+-$as_echo "#define SVN_HAVE_MACHO_ITERATE 1" >>confdefs.h
+-
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-else
+-
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+ 
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS property list utilities" >&5