From owner-svn-ports-head@freebsd.org Fri Mar 10 22:44:45 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20AC2D05210; Fri, 10 Mar 2017 22:44:45 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7B8D1212; Fri, 10 Mar 2017 22:44:44 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2AMihlO087541; Fri, 10 Mar 2017 22:44:43 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2AMihwJ087539; Fri, 10 Mar 2017 22:44:43 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201703102244.v2AMihwJ087539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 10 Mar 2017 22:44:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435847 - in head/databases/leveldb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Mar 2017 22:44:45 -0000 Author: sunpoet Date: Fri Mar 10 22:44:43 2017 New Revision: 435847 URL: https://svnweb.freebsd.org/changeset/ports/435847 Log: Run configure script in configure stage Modified: head/databases/leveldb/Makefile head/databases/leveldb/files/patch-Makefile Modified: head/databases/leveldb/Makefile ============================================================================== --- head/databases/leveldb/Makefile Fri Mar 10 22:01:16 2017 (r435846) +++ head/databases/leveldb/Makefile Fri Mar 10 22:44:43 2017 (r435847) @@ -14,6 +14,9 @@ LICENSE= BSD3CLAUSE OPTIONS_DEFINE= GPERFTOOLS SNAPPY OPTIONS_DEFAULT=SNAPPY +CONFIGURE_ARGS= build_config.mk ${WRKSRC}/ +CONFIGURE_SCRIPT= build_detect_platform +HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes TEST_TARGET= check USE_LDCONFIG= yes Modified: head/databases/leveldb/files/patch-Makefile ============================================================================== --- head/databases/leveldb/files/patch-Makefile Fri Mar 10 22:01:16 2017 (r435846) +++ head/databases/leveldb/files/patch-Makefile Fri Mar 10 22:44:43 2017 (r435847) @@ -1,6 +1,16 @@ ---- Makefile.orig 2016-08-11 14:33:30 UTC +--- Makefile.orig 2017-03-02 00:08:02 UTC +++ Makefile -@@ -125,12 +125,12 @@ SHARED_VERSION_MINOR = 19 +@@ -15,8 +15,7 @@ OPT ?= -O2 -DNDEBUG + #----------------------------------------------- + + # detect what platform we're building on +-$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \ +- ./build_detect_platform build_config.mk ./) ++# $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" ./build_detect_platform build_config.mk ./) + # this file is generated by the previous line to set build flags and sources + include build_config.mk + +@@ -126,12 +125,12 @@ SHARED_VERSION_MINOR = 20 SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) @@ -15,7 +25,7 @@ endif $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) -@@ -293,7 +293,7 @@ endif +@@ -294,7 +293,7 @@ endif $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS) rm -f $@