svn commit: r545078 - head/devel/codeblocks

[Piotr Kubaj]

Author: pkubaj
Date: Sat Aug 15 22:47:30 2020
New Revision: 545078
URL: https://svnweb.freebsd.org/changeset/ports/545078

Log:
  devel/codeblocks: fix build on non-x86
  
  dragscroll module uses x86 assembly, disable it on non-x86 architectures:
  libtool: compile:  g++9 -DHAVE_CONFIG_H -I. -I../../../../src/include -I/usr/local/lib/wx/include/gtk3-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread -D_THREAD_SAFE -I../../../../src/include -I../../../../src/src -I../../../../src/sdk/wxscintilla/include -DCB_AUTOCONF -isystem /usr/local/include -DPIC -I../../../../src/include/tinyxml -DTIXML_USE_STL=YES -O2 -pipe -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc9 -Wl,-rpath=/usr/local/lib/gcc9 -isystem /usr/local/include -fPIC -fexceptions -MT dragscrollcfg.lo -MD -MP -MF .deps/dragscrollcfg.Tpo -c dragscrollcfg.cpp  -fPIC -DPIC -o .libs/dragscrollcfg.o
  --- dragscrollcfg.lo ---
  {standard input}: Assembler messages:
  {standard input}:1398: Error: unrecognized opcode: `int3'
  *** [dragscrollcfg.lo] Error code 1

Modified:
  head/devel/codeblocks/Makefile
  head/devel/codeblocks/pkg-plist

Modified: head/devel/codeblocks/Makefile
==============================================================================
--- head/devel/codeblocks/Makefile	Sat Aug 15 22:39:44 2020	(r545077)
+++ head/devel/codeblocks/Makefile	Sat Aug 15 22:47:30 2020	(r545078)
@@ -26,8 +26,8 @@ USE_WX=		3.0+
 USE_GNOME=	gtk30 cairo
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG} --with-contrib-plugins=all \
-		--disable-pch --with-boost-system=boost_system
+CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG} --disable-pch \
+		--with-boost-system=boost_system
 PKG_CONFIG_LIBDIR=	${LOCALBASE}/libdata/pkgconfig
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
@@ -35,4 +35,14 @@ USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+CONFIGURE_ARGS+=	--with-contrib-plugins=all,-dragscroll
+PLIST_SUB=	X86="@comment "
+.else
+CONFIGURE_ARGS+=	--with-contrib-plugins=all
+PLIST_SUB=	X86=""
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/devel/codeblocks/pkg-plist
==============================================================================
--- head/devel/codeblocks/pkg-plist	Sat Aug 15 22:39:44 2020	(r545077)
+++ head/devel/codeblocks/pkg-plist	Sat Aug 15 22:47:30 2020	(r545078)
@@ -355,7 +355,7 @@ lib/codeblocks/plugins/libcompiler.so
 lib/codeblocks/plugins/libcopystrings.so
 lib/codeblocks/plugins/libdebugger.so
 lib/codeblocks/plugins/libdefaultmimehandler.so
-lib/codeblocks/plugins/libdragscroll.so
+%%X86%%lib/codeblocks/plugins/libdragscroll.so
 lib/codeblocks/plugins/libenvvars.so
 lib/codeblocks/plugins/libexporter.so
 lib/codeblocks/plugins/libheaderfixup.so
@@ -632,7 +632,7 @@ share/applications/codeblocks.desktop
 %%DATADIR%%/copystrings.zip
 %%DATADIR%%/debugger.zip
 %%DATADIR%%/defaultmimehandler.zip
-%%DATADIR%%/dragscroll.zip
+%%X86%%%%DATADIR%%/dragscroll.zip
 %%DATADIR%%/envvars.zip
 %%DATADIR%%/exporter.zip
 %%DATADIR%%/headerfixup.zip