Date: Wed, 10 Jan 2018 13:37:47 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458638 - in head/lang/rexx-regina: . files Message-ID: <201801101337.w0ADbld1020564@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jan 10 13:37:46 2018 New Revision: 458638 URL: https://svnweb.freebsd.org/changeset/ports/458638 Log: Improve bitness detection in the configure script (use the fact that all 64-bit architectures supported by FreeBSD have that ``64'' suffix in the machine processor architecture reported by ``uname -p'') and tentatively unbreak the port, well, everywhere. While here, remove outdated and now useless, no-op fixups for the configure script. Tested on: i386, amd64, powerpc, sparc64 Modified: head/lang/rexx-regina/Makefile head/lang/rexx-regina/files/patch-configure Modified: head/lang/rexx-regina/Makefile ============================================================================== --- head/lang/rexx-regina/Makefile Wed Jan 10 13:19:08 2018 (r458637) +++ head/lang/rexx-regina/Makefile Wed Jan 10 13:37:46 2018 (r458638) @@ -18,14 +18,6 @@ COMMENT= Rexx interpreter LICENSE= LGPL21+ -BROKEN_aarch64= Does not build: error: expected expression -BROKEN_armv6= Does not build: error: expected expression -BROKEN_armv7= Does not build: error: expected expression -BROKEN_mips= Does not build: error: expected expression -BROKEN_mips64= Does not build: error: expected expression -BROKEN_powerpc64= Does not build: error: expected expression -BROKEN_sparc64= Does not build: error: expected expression - USES= gmake iconv ncurses USE_RC_SUBR= rxstack GNU_CONFIGURE= yes @@ -44,20 +36,11 @@ OPTIONS_DEFINE= DOCS EXAMPLES DOCS_DISTFILES= regina.pdf:docs \ regutil.pdf:docs -.include <bsd.port.options.mk> - -.if ${ARCH} == i386 || ${ARCH} == powerpc -CONFIGURE_ARGS+= --enable-32bit -.endif - post-extract-DOCS-on: @${CP} ${DISTDIR}/${DIST_SUBDIR}/regina.pdf ${WRKDIR} @${CP} ${DISTDIR}/${DIST_SUBDIR}/regutil.pdf ${WRKDIR} post-patch: - @${REINPLACE_CMD} -e \ - '/$${CFLAGS}/s|^|#| ; \ - s|"-lpthread"|"-pthread"|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '/^examplesdir/s|=.*|= $$(datadir)/examples/$$(PACKAGE)| ; \ /$$(sysconfdir)/s|^|#|' ${WRKSRC}/Makefile.in Modified: head/lang/rexx-regina/files/patch-configure ============================================================================== --- head/lang/rexx-regina/files/patch-configure Wed Jan 10 13:19:08 2018 (r458637) +++ head/lang/rexx-regina/files/patch-configure Wed Jan 10 13:37:46 2018 (r458638) @@ -1,20 +1,31 @@ --- configure.orig 2015-01-18 20:33:40 UTC +++ configure -@@ -3490,6 +3490,13 @@ case "$target" in +@@ -3490,13 +3490,22 @@ case "$target" in osis64bit=yes fi ;; +- *-freebsd* | *-openbsd*) + *-dragonfly*) -+ mach="`uname -m`" + mach="`uname -m`" +- if test "$mach" = "amd64"; then + if test "$mach" = "x86_64"; then + bitflag="64" + osis64bit=yes + fi + ;; ++ *-freebsd* | *-openbsd*) ++ mach="`uname -p`" ++ if test "${mach%64}" = "$mach"; then ++ bitflag="32" ++ else + bitflag="64" + osis64bit=yes + fi + ;; - *-freebsd* | *-openbsd*) - mach="`uname -m`" - if test "$mach" = "amd64"; then -@@ -6256,6 +6263,10 @@ rm -f core conftest.err conftest.$ac_obj + *nto-qnx*) + ;; + *qnx*) +@@ -6256,6 +6265,10 @@ rm -f core conftest.err conftest.$ac_objext \ ;; *linux*) ;; @@ -25,7 +36,7 @@ *freebsd*) THREADING_COMPILE="-pthread -D_REENTRANT -DPOSIX -DREGINA_REENTRANT" THREADING_LINK="-pthread" -@@ -8679,7 +8690,14 @@ case "$target" in +@@ -8679,7 +8692,14 @@ case "$target" in SHLPRE="lib" SHL_LD="ld -assert pure-text -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')' ;; @@ -41,7 +52,7 @@ if test "$ac_cv_prog_CC" = "gcc" -o "$ac_cv_prog_CC" = "g++" -o "$ac_cv_prog_CC" = "clang"; then LD_RXLIB_A1="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)" LD_RXLIB_A2="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)" -@@ -9429,7 +9447,7 @@ $as_echo_n "checking OS distribution nam +@@ -9429,7 +9449,7 @@ $as_echo_n "checking OS distribution name... " >&6; } $as_echo "$MYDISTRO" >&6; } else case "$target" in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801101337.w0ADbld1020564>