Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Dec 2016 20:18:38 +0000 (UTC)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428322 - head/comms/java-simple-serial-connector
Message-ID:  <201612102018.uBAKIc8m031650@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bsam
Date: Sat Dec 10 20:18:38 2016
New Revision: 428322
URL: https://svnweb.freebsd.org/changeset/ports/428322

Log:
  comms/java-simple-serial-connector: Do not rewrite system variable ARCH:
  rename ARCH -> JSSC_ARCH.
  
  PR:		177334
  Submitted by:	linimon
  Patched by:	Kyle Evans <bsdports@kyle-evans.net> (maintainer)

Modified:
  head/comms/java-simple-serial-connector/Makefile

Modified: head/comms/java-simple-serial-connector/Makefile
==============================================================================
--- head/comms/java-simple-serial-connector/Makefile	Sat Dec 10 20:10:15 2016	(r428321)
+++ head/comms/java-simple-serial-connector/Makefile	Sat Dec 10 20:18:38 2016	(r428322)
@@ -25,7 +25,9 @@ PLIST_FILES=	${JAVA_HOME}/jre/lib/ext/js
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv6" || ${ARCH} == "aarch64"
-ARCH=		arm
+JSSC_ARCH=		arm
+.else
+JSSC_ARCH=		${ARCH}
 .endif
 
 post-extract:
@@ -35,8 +37,8 @@ post-extract:
 pre-build:
 	${RM} -r ${WRKSRC_LIBS}/*
 	${MKDIR} ${WRKSRC_LIBS}/freebsd
-	(cd ${WRKSRC}/src/cpp/_nix_based && ${CXX} ${CXXFLAGS} ${CPPFLAGS} -shared -fPIC -o ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${ARCH}.so jssc.cpp)
-	${STRIP_CMD} ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${ARCH}.so
+	(cd ${WRKSRC}/src/cpp/_nix_based && ${CXX} ${CXXFLAGS} ${CPPFLAGS} -shared -fPIC -o ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${JSSC_ARCH}.so jssc.cpp)
+	${STRIP_CMD} ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${JSSC_ARCH}.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612102018.uBAKIc8m031650>