Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix utf8proc include path for flisp #17734

Merged
merged 1 commit into from
Aug 1, 2016
Merged

Conversation

iblislin
Copy link
Member

@iblislin iblislin commented Aug 1, 2016

I got this error with USE_SYSTEM_UTF8PROC=1 and UTF8PROC_INC=/usr/local/include on branch release-0.4.

gmake[3]: Entering directory '/usr/home/iblis/git/fbsd-ports-julia/work/julia-0.4.6/src/flisp'
    CC src/array.o
    CC src/dump.o
    CC src/flisp/flisp.dbg.obj
    CC src/flisp/builtins.dbg.obj
    CC src/toplevel.o
    CC src/flisp/string.dbg.obj
string.c:23:10: fatal error: 'utf8proc.h' file not found
#include "utf8proc.h"
         ^
1 error generated.

A patch is here:

--- src/flisp/Makefile.orig     2016-08-01 06:13:50 UTC
+++ src/flisp/Makefile
@@ -32,7 +32,7 @@ LIBS += -lpthread
 endif

 FLAGS = -I$(LLTDIR) $(CFLAGS) $(HFILEDIRS:%=-I%) \
-        -I$(LIBUV_INC) -I$(build_includedir) $(LIBDIRS:%=-L%) \
+        -I$(LIBUV_INC) -I$(UTF8PROC_INC) -I$(build_includedir) $(LIBDIRS:%=-L%) \
         -DLIBRARY_EXPORTS -DUTF8PROC_EXPORTS
 ifneq ($(USEMSVC), 1)
 FLAGS += -Wall -Wno-strict-aliasing -DUSE_COMPUTED_GOTO -fvisibility=hidden

@tkelman
Copy link
Contributor

tkelman commented Aug 1, 2016

Mind submitting that as a pull request?

@iblislin
Copy link
Member Author

iblislin commented Aug 1, 2016

@tkelman ok, i can make it.

Should i cherry pick the commit to other branch or just master?

@tkelman
Copy link
Contributor

tkelman commented Aug 1, 2016

If it's needed on both branches, make the PR against master first and we'll mark it for backporting to 0.4.

@tkelman
Copy link
Contributor

tkelman commented Aug 1, 2016

Whoa, did you turn the issue into a PR? That requires some github api magic, right?

@tkelman tkelman added domain:building Build system, or building Julia or its dependencies backport pending 0.4 labels Aug 1, 2016
@iblislin
Copy link
Member Author

iblislin commented Aug 1, 2016

@tkelman yep. I use hub pull-requrest -i <num> for converting it.

Some of my projects are using this workflow: someone open issue -> discussion -> attach a branch to this issue and convert it to a PR.
But github has announced that this feature will be deprecated in future. 😭

@tkelman tkelman merged commit 32fecde into JuliaLang:master Aug 1, 2016
mfasi pushed a commit to mfasi/julia that referenced this pull request Sep 5, 2016
tkelman pushed a commit that referenced this pull request Sep 13, 2016
close #17734

(cherry picked from commit 159f8f5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
domain:building Build system, or building Julia or its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants