Skip to content

Commit

Permalink
Merge pull request #12031 from stevengj/utf8proc-1.3
Browse files Browse the repository at this point in the history
bump utf8proc to v1.3
  • Loading branch information
stevengj committed Jul 9, 2015
2 parents 477e861 + b6cab40 commit 026a4cb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ New language features
`T(...)` falls back to `convert(T, x)`, so all `convert` methods implicitly
define a constructor ([#8712], [#2403]).

* Unicode version 7 is now supported for identifiers etcetera ([#7917]).
* Unicode version 8 is now supported for identifiers etcetera ([#7917], [#12031]).

* Type parameters now permit any arbitrary `isbits` type, not just
`Int` and `Bool` ([#6081]).
Expand Down Expand Up @@ -1510,3 +1510,4 @@ Too numerous to mention.
[#11891]: https://github.com/JuliaLang/julia/issues/11891
[#11922]: https://github.com/JuliaLang/julia/issues/11922
[#11985]: https://github.com/JuliaLang/julia/issues/11985
[#12031]: https://github.com/JuliaLang/julia/issues/12031
4 changes: 2 additions & 2 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1437,10 +1437,10 @@ UTF8PROC_SRC_TARGET = $(UTF8PROC_SRC_DIR)/libutf8proc.a
UTF8PROC_OBJ_LIB = $(build_libdir)/libutf8proc.a
UTF8PROC_OBJ_HEADER = $(build_includedir)/utf8proc.h
UTF8PROC_OBJ_TARGET = $(UTF8PROC_OBJ_LIB) $(UTF8PROC_OBJ_HEADER)
UTF8PROC_CFLAGS = -O2 -std=c99 $(fPIC) -DUTF8PROC_EXPORTS
UTF8PROC_CFLAGS = -O2

$(UTF8PROC_SRC_TARGET): $(UTF8PROC_SRC_DIR)/Makefile
$(MAKE) -C $(UTF8PROC_SRC_DIR) CC="$(CC) $(DEPS_CFLAGS)" CFLAGS="$(CFLAGS) $(UTF8PROC_CFLAGS)" AR="$(AR)" libutf8proc.a
$(MAKE) -C $(UTF8PROC_SRC_DIR) CC="$(CC) $(DEPS_CFLAGS)" CFLAGS="$(CFLAGS) $(UTF8PROC_CFLAGS)" PICFLAG="$(fPIC)" AR="$(AR)" libutf8proc.a
touch -c $@
$(UTF8PROC_SRC_DIR)/checked: $(UTF8PROC_SRC_TARGET)
ifeq ($(OS),$(BUILD_OS))
Expand Down
4 changes: 2 additions & 2 deletions deps/utf8proc.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
UTF8PROC_BRANCH=1.3-dev1
UTF8PROC_SHA1=f7219d516efe7496737d041f22b0ba567174fb16
UTF8PROC_BRANCH=v1.3
UTF8PROC_SHA1=85789180158ac7fff85b9f008828d6ac44f072ea

0 comments on commit 026a4cb

Please sign in to comment.