Commit463c7e9

committed

Update fallback libs

1 parent83f7351 commit463c7e9Copy full SHA for 463c7e9

File tree

+20

-9

lines changed

+20

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`Package: xml2`
`2`	`2`	`Title: Parse XML`
`3`		`-Version: 1.3.7`
	`3`	`+Version: 1.3.7.9000`
`4`	`4`	`Authors@R: c(`
`5`	`5`	`person("Hadley", "Wickham", role = "aut"),`
`6`	`6`	`person("Jim", "Hester", role = "aut"),`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ ifneq ($(PKG_LIBS),)`
`7`	`7`	`$(info using $(PKG_CONFIG_NAME) from Rtools)`
`8`	`8`	`PKG_CPPFLAGS := $(shell $(PKG_CONFIG) --cflags $(PKG_CONFIG_NAME)) $(STATIC_CFLAGS)`
`9`	`9`	`else`
`10`		`-RWINLIB = ../windows/libxml2-2.10.3`
	`10`	`+RWINLIB = ../windows/libxml2`
`11`	`11`	`PKG_CPPFLAGS = -I$(RWINLIB)/include -I$(RWINLIB)/include/libxml2 $(STATIC_CFLAGS)`
`12`		`-PKG_LIBS = -L$(RWINLIB)/lib${subst gcc,,$(COMPILED_BY)}$(R_ARCH) \`
`13`		`--L$(RWINLIB)/lib$(R_ARCH) -lxml2 -llzma -liconv -lz -lws2_32`
	`12`	`+PKG_LIBS = -L$(RWINLIB)/lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) -L$(RWINLIB)/lib \`
	`13`	`+-lxml2 -llzma -liconv -lz -lws2_32`
`14`	`14`	`endif`
`15`	`15`
`16`	`16`	`all: $(SHLIB)`

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,18 @@`
`1`		`-# Build against static libraries from rwinlib`
`2`		`-if(!file.exists("../windows/libxml2-2.10.3/include/libxml2/libxml/parser.h")){`
`3`		`- download.file("https://github.com/rwinlib/libxml2/archive/v2.10.3.zip","lib.zip",quiet=TRUE)`
	`1`	`+if(!file.exists("../windows/libxml2/include/libxml2/libxml")){`
	`2`	`+ unlink("../windows",recursive=TRUE)`
	`3`	`+url<-if(grepl("aarch",R.version$platform)){`
	`4`	`+"https://github.com/r-windows/bundles/releases/download/libxml2-2.11.5/libxml2-2.11.5-clang-aarch64.tar.xz"`
	`5`	`+ }elseif(grepl("clang", Sys.getenv('R_COMPILED_BY'))){`
	`6`	`+"https://github.com/r-windows/bundles/releases/download/libxml2-2.11.5/libxml2-2.11.5-clang-x86_64.tar.xz"`
	`7`	`+ }elseif(getRversion()>="4.2") {`
	`8`	`+"https://github.com/r-windows/bundles/releases/download/libxml2-2.11.5/libxml2-2.11.5-ucrt-x86_64.tar.xz"`
	`9`	`+ }else {`
	`10`	`+"https://github.com/rwinlib/libxml2/archive/v2.10.3.tar.gz"`
	`11`	`+ }`
	`12`	`+ download.file(url, basename(url),quiet=TRUE)`
`4`	`13`	`dir.create("../windows",showWarnings=FALSE)`
`5`		`- unzip("lib.zip",exdir="../windows")`
`6`		`- unlink("lib.zip")`
	`14`	`+ untar(basename(url),exdir="../windows",tar='internal')`
	`15`	`+ unlink(basename(url))`
	`16`	`+ setwd("../windows")`
	`17`	`+ file.rename(list.files(),'libxml2')`
`7`	`18`	`}`

Comments

(0)