snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

common/buildstyle/python*: build dir can be used as python identifier 

in order to make gufw installation process work, it includes itself
while installing. this raise the need that the build directory needs
to be a valid python identifier too. this commit solves this issue.
This commit is contained in:
Enno Boland 2017-01-05 11:15:46 +01:00
parent c81e6f0939
commit a02132b2ae
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/build-style/python-module.sh
View File

@ -19,9 +19,9 @@ do_build() {
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python${pyver} setup.py \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \
build --build-base=build-${pyver} ${make_build_args} build --build-base=build${pyver//./_} ${make_build_args}
else else
python${pyver} setup.py build --build-base=build-${pyver} ${make_build_args} python${pyver} setup.py build --build-base=build${pyver//./_} ${make_build_args}
fi fi
done done
} }
@ -43,10 +43,10 @@ do_install() {
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python${pyver} setup.py \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \
build --build-base=build-${pyver} \ build --build-base=build${pyver//./_} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args} install --prefix=/usr --root=${DESTDIR} ${make_install_args}
else else
python${pyver} setup.py build --build-base=build-${pyver} \ python${pyver} setup.py build --build-base=build${pyver//./_} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args} install --prefix=/usr --root=${DESTDIR} ${make_install_args}
fi fi

8
common/build-style/python2-module.sh
View File

@ -12,9 +12,9 @@ do_build() {
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python2 setup.py \ LDFLAGS="$LDFLAGS" python2 setup.py \
build --build-base=build-${py2_ver} ${make_build_args} build --build-base=build${py2_ver//./_} ${make_build_args}
else else
python2 setup.py build --build-base=build-${py2_ver} ${make_build_args} python2 setup.py build --build-base=build${py2_ver}//./_ ${make_build_args}
fi fi
} }
@ -28,10 +28,10 @@ do_install() {
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python2 setup.py \ LDFLAGS="$LDFLAGS" python2 setup.py \
build --build-base=build-${py2_ver} \ build --build-base=build${py2_ver//./_} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args} install --prefix=/usr --root=${DESTDIR} ${make_install_args}
else else
python2 setup.py build --build-base=build-${py2_ver} \ python2 setup.py build --build-base=build${py2_ver//./_} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args} install --prefix=/usr --root=${DESTDIR} ${make_install_args}
fi fi
} }

8
common/build-style/python3-module.sh
View File

@ -12,9 +12,9 @@ do_build() {
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python3 setup.py \ LDFLAGS="$LDFLAGS" python3 setup.py \
build --build-base=build-${py3_ver} ${make_build_args} build --build-base=build${py3_ver//./_} ${make_build_args}
else else
python3 setup.py build --build-base=build-${py3_ver} ${make_build_args} python3 setup.py build --build-base=build${py3_ver//./_} ${make_build_args}
fi fi
} }
@ -28,10 +28,10 @@ do_install() {
env CC="$CC" LDSHARED="$LDSHARED" \ env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python3 setup.py \ LDFLAGS="$LDFLAGS" python3 setup.py \
build --build-base=build-${py3_ver} \ build --build-base=build${py3_ver//./_} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args} install --prefix=/usr --root=${DESTDIR} ${make_install_args}
else else
python3 setup.py build --build-base=build-${py3_ver} \ python3 setup.py build --build-base=build${py3_ver//./_} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args} install --prefix=/usr --root=${DESTDIR} ${make_install_args}
fi fi
} }