Skip to content

Commit

Permalink
Fix Tilix Build
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfouquart
jfouquart committed Jun 19, 2019
1 parent df2501e commit dd44202
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
10 changes: 5 additions & 5 deletions lang/ldc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ COMMENT= The LLVM-based D compiler

LICENSE= BSD3CLAUSE

BUILD_DEPENDS= llvm70>0:devel/llvm70 \
BUILD_DEPENDS= llvm60>0:devel/llvm60 \
ninja:devel/ninja
RUN_DEPENDS= llvm70>0:devel/llvm70
RUN_DEPENDS= llvm60>0:devel/llvm60
LIB_DEPENDS= libconfig.so:devel/libconfig

BROKEN_armv6= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
Expand All @@ -33,11 +33,11 @@ GH_TUPLE= ldc-developers:ldc:d442f9f:tree/ltsmaster \
CMAKE_ARGS+= -DD_COMPILER:STRING="${WRKSRC}/ltsmaster/bin/ldmd2" \
-DBUILD_SHARED_LIBS:STRING="BOTH"

CC= clang70
CXX= clang++70
CC= clang60
CXX= clang++60

BOOTVER= 0.17.6
LLVM_CONFIG= llvm-config70
LLVM_CONFIG= llvm-config60
LDCVER= ${PORTVERSION}

.include <bsd.port.pre.mk>
Expand Down
1 change: 1 addition & 0 deletions x11-toolkits/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
SUBDIR += gtk30
SUBDIR += gtkada
SUBDIR += gtkada3
SUBDIR += gtkd-3
SUBDIR += gtkdatabox
SUBDIR += gtkextra
SUBDIR += gtkglarea2
Expand Down
1 change: 1 addition & 0 deletions x11/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@
SUBDIR += thinglaunch
SUBDIR += thingylaunch
SUBDIR += tilda
SUBDIR += tilix
SUBDIR += tint
SUBDIR += trayer
SUBDIR += tycoon
Expand Down
4 changes: 3 additions & 1 deletion x11/tilix/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LIB_DEPENDS+= libunwind.so:devel/libunwind \
libgtkd-3.so:x11-toolkits/gtkd-3 \
libvted-3.so:x11-toolkits/gtkd-3

USES= meson gnome shebangfix
USES= meson gettext-tools gnome pkgconfig python:3.6+,build shebangfix
USE_XORG= x11
USE_GNOME= gtk30 vte3
USE_GITHUB= yes
Expand All @@ -24,6 +24,8 @@ SSP_UNSAFE= yes # not understood by ldc2
SHEBANG_FILES= data/scripts/tilix_int.sh
GLIB_SCHEMAS= com.gexperts.Tilix.gschema.xml

BINARY_ALIAS+= python3=${PYTHON_CMD}

post-patch:
${CP} ${FILESDIR}/LINGUAS ${WRKSRC}/po

Expand Down

3 comments on commit dd44202

@jfouquart
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

First thanks for porting tilix ( the best terminal emulator for me ).
For the patch in lang/ldc, i'm on freebsd 12 and when i link tilix, i have an intrinsics error on memcpy, this is why i downgrade compiler to clang-6.

PS: sorry for my poor english.

@yurivict
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This site is a mirror and doesn't accept pull requests.

Please submit a patch to https://bugs.freebsd.org

Also, you can't change the llvm version (70->60) without specifying what is wrong with this version. FYI, the latest version is 80, with 90 being a beta.

@yurivict
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jfouquart Could you please e-mail me a shar of the port x11/tilix to yuri@freebsd.org because I can't find a record of tilix even ever being in the ports tree.

Please sign in to comment.