diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-15 22:47:30 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-15 22:47:30 +0000 |
| commit | d4704fd26ca04c53d5c0f0d03336af0107d90991 (patch) | |
| tree | 445c70893f839e9c065901bc1855a85f755981f8 | |
| parent | sysutils/p5-Proc-ProcessTable-InfoString: create port (diff) | |
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
Notes
Notes:
svn path=/head/; revision=545078
| -rw-r--r-- | devel/codeblocks/Makefile | 16 | ||||
| -rw-r--r-- | devel/codeblocks/pkg-plist | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile index 9ce09385ef15..9cd199e17203 100644 --- a/devel/codeblocks/Makefile +++ b/devel/codeblocks/Makefile @@ -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> diff --git a/devel/codeblocks/pkg-plist b/devel/codeblocks/pkg-plist index 3f39b2ba41c0..cf1e38f1b61f 100644 --- a/devel/codeblocks/pkg-plist +++ b/devel/codeblocks/pkg-plist @@ -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 |