Commit44260e2

authored

fix pgml conflicts with plpython (#931)

1 parentdd722c8 commit44260e2Copy full SHA for 44260e2

File tree

+24

-4

lines changed

+24

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ jobs:`
`88`	`88`	`libpython3.10-dev \`
`89`	`89`	`python3.10-dev \`
`90`	`90`	`ruby \`
`91`		`-mold`
	`91`	`+lld`
`92`	`92`
`93`	`93`	`curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem`
`94`	`94`	`sudo gem install deb-s3-0.11.4.gem`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ postgresql-server-dev-${POSTGRES_VERSION}`
`278`	`278`	`python3`
`279`	`279`	`python3-pip`
`280`	`280`	`libpython3`
`281`		`-mold`
	`281`	`+lld`
`282`	`282`	```
`283`	`283`
`284`	`284`	`#####Rust`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]`
`4`	`4`
`5`	`5`	`[target.x86_64-unknown-linux-gnu]`
`6`		`-rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=/usr/bin/mold"]`
	`6`	`+rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=lld"]`
`7`	`7`
`8`	`8`	`[target.aarch64-unknown-linux-gnu]`
`9`		`-rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=/usr/bin/mold"]`
	`9`	`+rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=lld"]`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,16 @@ fn main() {`
`4`	`4`	`println!("cargo:rustc-link-search=/opt/homebrew/opt/openblas/lib");`
`5`	`5`	`println!("cargo:rustc-link-search=/opt/homebrew/opt/libomp/lib");`
`6`	`6`	`}`
	`7`	`+`
	`8`	`+// PostgreSQL is using dlopen(RTLD_GLOBAL). this will parse some`
	`9`	`+// of symbols into the previous opened .so file, but the others will use a`
	`10`	`+// relative offset in pgml.so, and will cause a null-pointer crash.`
	`11`	`+//`
	`12`	`+// hid all symbol to avoid symbol conflicts.`
	`13`	`+//`
	`14`	`+// append mode (link-args) only works with clang ld (lld)`
	`15`	`+println!(`
	`16`	`+"cargo:link-args=-Wl,--version-script={}/ld.map",`
	`17`	`+ std::env::current_dir().unwrap().to_string_lossy(),`
	`18`	`+);`
`7`	`19`	`}`

Lines changed: 8 additions & 0 deletions

Comments

(0)