mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-19 13:24:51 +08:00
make sure -fpic -fpie from CFLAGS bleeds through to libxslt compilation
This commit is contained in:
parent
e7d6f37e98
commit
861c49c9bc
@ -25,12 +25,14 @@ trait libxslt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
shell()->cd($this->source_dir)
|
shell()->cd($this->source_dir)
|
||||||
->exec(
|
->setEnv([
|
||||||
'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ' .
|
'CFLAGS' => trim($this->getLibExtraCFlags() . ' -I' . BUILD_INCLUDE_PATH),
|
||||||
|
'LDFLAGS' => trim($this->getLibExtraLdFlags() . ' -L' . BUILD_LIB_PATH),
|
||||||
|
'LIBS' => trim($this->getLibExtraLibs() . "{$required_libs} -lstdc++")
|
||||||
|
])
|
||||||
|
->execWithEnv(
|
||||||
"{$this->builder->getOption('library_path')} " .
|
"{$this->builder->getOption('library_path')} " .
|
||||||
"{$this->builder->getOption('ld_library_path')} " .
|
"{$this->builder->getOption('ld_library_path')} " .
|
||||||
'LDFLAGS="-L' . BUILD_LIB_PATH . '" ' .
|
|
||||||
"LIBS='{$required_libs} -lstdc++' " .
|
|
||||||
'./configure ' .
|
'./configure ' .
|
||||||
'--enable-static --disable-shared ' .
|
'--enable-static --disable-shared ' .
|
||||||
'--without-python ' .
|
'--without-python ' .
|
||||||
@ -41,9 +43,9 @@ trait libxslt
|
|||||||
'--with-libxml-prefix=' . escapeshellarg(BUILD_ROOT_PATH) . ' ' .
|
'--with-libxml-prefix=' . escapeshellarg(BUILD_ROOT_PATH) . ' ' .
|
||||||
'--prefix='
|
'--prefix='
|
||||||
)
|
)
|
||||||
->exec('make clean')
|
->execWithEnv('make clean')
|
||||||
->exec("make -j{$this->builder->concurrency}")
|
->execWithEnv("make -j{$this->builder->concurrency}")
|
||||||
->exec('make install DESTDIR=' . escapeshellarg(BUILD_ROOT_PATH));
|
->execWithEnv('make install DESTDIR=' . escapeshellarg(BUILD_ROOT_PATH));
|
||||||
$this->patchPkgconfPrefix(['libexslt.pc']);
|
$this->patchPkgconfPrefix(['libexslt.pc']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user