Remove hardcoded CC variable

Those are now set by makepkg
This commit is contained in:
Biswapriyo Nath
2022-08-19 14:07:25 +05:30
committed by GitHub
parent 7e5c84f06c
commit cfa90447df
10 changed files with 9 additions and 13 deletions

View File

@@ -49,12 +49,12 @@ build() {
cp -rf ${srcdir}/phc-winner-argon2-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
cd "${srcdir}/build-${MINGW_CHOST}"
make CC=${MINGW_PREFIX}/bin/gcc AR=${MINGW_PREFIX}/bin/ar OPTTARGET=${_march}
make AR=${MINGW_PREFIX}/bin/ar OPTTARGET=${_march}
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make install DESTDIR="${pkgdir}" CC=${MINGW_PREFIX}/bin/gcc AR=${MINGW_PREFIX}/bin/ar PREFIX="${MINGW_PREFIX}" OPTTARGET=${_march}
make install DESTDIR="${pkgdir}" AR=${MINGW_PREFIX}/bin/ar PREFIX="${MINGW_PREFIX}" OPTTARGET=${_march}
install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
install -Dm644 ${srcdir}/libargon2.pc "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libargon2.pc"

View File

@@ -49,7 +49,6 @@ build() {
CONFIG_NDEBUG=1 \
CONFIG_WINDOWS=1 \
CONFIG_SHARED=1 \
CC=gcc \
make all -f "${srcdir}/${_realname}-${pkgver}/Makefile"
# Build static lib.
@@ -61,7 +60,6 @@ build() {
PREFIX=$MINGW_PREFIX \
CONFIG_NDEBUG=1 \
CONFIG_WINDOWS=1 \
CC=gcc \
make lib -f "${srcdir}/${_realname}-${pkgver}/Makefile"
}

View File

@@ -29,7 +29,6 @@ build() {
mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
cp -R ${srcdir}/${_realname}-${pkgver}/. "${srcdir}"/build-${CARCH}
CC=${MINGW_PREFIX}/bin/gcc \
AR=${MINGW_PREFIX}/bin/ar \
SONAME=libhttp_parser-2.dll \
LIBNAME=libhttp_parser-2.dll \

View File

@@ -83,7 +83,7 @@ build() {
--with-libxml-prefix=${MINGW_PREFIX} \
--without-python
CC=${MINGW_PREFIX}/bin/gcc make
make
}
package() {

View File

@@ -55,7 +55,7 @@ build() {
AR="ar rcu" \
RANLIB="ranlib" \
STRIP="strip" \
CC="${MINGW_CHOST}-gcc" \
CC="${CC}" \
mingw
# Check we do not encounter:

View File

@@ -34,7 +34,7 @@ build() {
DEST_OS=win32 \
TARGET=${MINGW_CHOST} \
PKG_CONFIG=${MINGW_PREFIX}/bin/pkg-config \
CC=gcc PERL=/usr/bin/perl \
PERL=/usr/bin/perl \
AR=${MINGW_PREFIX}/bin/ar \
WINDRES=${MINGW_PREFIX}/bin/windres \
RST2MAN=${MINGW_PREFIX}/bin/rst2man3 \

View File

@@ -29,7 +29,7 @@ build() {
[[ "$CARCH" == "i686" ]] && arch_make=32
cd "${srcdir}/${_realname}-${pkgver}"
make ARCH=${arch_make} CC=${MINGW_PREFIX}/bin/gcc
make ARCH=${arch_make}
}
package() {

View File

@@ -34,7 +34,6 @@ build() {
SSE="--enable-sse"
fi
./configure --prefix=${MINGW_PREFIX} \
CC="${MINGW_PREFIX}/bin/gcc" \
--with-libimagequant=${MINGW_PREFIX}/lib/ \
${SSE}
make --jobs=1

View File

@@ -73,11 +73,11 @@ prepare() {
build() {
cp -rf "${srcdir}/$_realname" "${srcdir}/build-${MINGW_CHOST}"
cd "${srcdir}/build-${MINGW_CHOST}"
make CC=gcc LD=ld AR=ar SYS=mingw
make CC=${CC} LD=ld AR=ar SYS=mingw
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
mkdir -p ${pkgdir}${MINGW_PREFIX}/lib
make CC=gcc LD=ld AR=ar SYS=mingw prefix=${MINGW_PREFIX} mandir=${MINGW_PREFIX}/share/man DESTDIR="${pkgdir}" install
make CC=${CC} LD=ld AR=ar SYS=mingw prefix=${MINGW_PREFIX} mandir=${MINGW_PREFIX}/share/man DESTDIR="${pkgdir}" install
}

View File

@@ -25,7 +25,7 @@ build() {
AR="ar rcu" \
RANLIB="ranlib" \
STRIP="strip" \
CC="${MINGW_CHOST}-gcc"
CC="${CC}"
}
package(){