jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
This reverts commit a02132b2ae.

Actually, the issue with packages using python-distutils-extra hasn't
been solved. On the contrary, python build style now generates malformed
packages, e.g., gufw:

+-- usr
    +-- lib
    |   +-- python3.5
    |       +-- site-packages
    |           +-- build3_5
    |           |   +-- lib
    |           |       +-- gufw
    |           |           +-- __init__.py
    |           |           +-- gufw
    |           |           +-- gufw.py
    |           +-- gufw
    |           |   +-- __init__.py
    |           |   +-- gufw
    |           |   +-- gufw.py
    |           +-- gufw-17.04.1-py3.5.egg-info

I don't have a clean solution handy right now, but that obviously isn't.
This commit is contained in:
Alessio Sergi 2017-01-12 12:27:12 +01:00
parent 2bc8e7b1de
commit 2014e03dac
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
} }