From 22c370a6a19626b1c377690c1a6bb6dcfb98de36 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 8 Oct 2016 02:02:07 +0000 Subject: [PATCH 1/8] buildx.sh: use "mkdir -p" to create $PREFIX_DIR, don't retry Improve messages about $PREFIX_DIR --- xorg/X11R7.6/buildx.sh | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh index 22dfe15f..3b8e0acd 100755 --- a/xorg/X11R7.6/buildx.sh +++ b/xorg/X11R7.6/buildx.sh @@ -218,37 +218,28 @@ else export PREFIX_DIR=$1 fi -if ! test -d $PREFIX_DIR; then - echo "dir does not exist, creating [$PREFIX_DIR]" - if ! mkdir $PREFIX_DIR - then - echo "mkdir failed [$PREFIX_DIR]" - exit 0 - fi -fi - -echo "using $PREFIX_DIR" - -export PKG_CONFIG_PATH=$PREFIX_DIR/lib/pkgconfig:$PREFIX_DIR/share/pkgconfig -export PATH=$PREFIX_DIR/bin:$PATH -export LDFLAGS=-Wl,-rpath=$PREFIX_DIR/lib -export CFLAGS="-I$PREFIX_DIR/include -fPIC -O2" - # prefix dir must exist... if [ ! -d $PREFIX_DIR ]; then - if ! mkdir -p $PREFIX_DIR - then - echo "$PREFIX_DIR does not exist; failed to create it - cannot continue" + echo "$PREFIX_DIR does not exist, creating it" + if ! mkdir -p $PREFIX_DIR; then + echo "$PREFIX_DIR cannot be created - cannot continue" exit 1 fi fi # ...and be writable if [ ! -w $PREFIX_DIR ]; then - echo "directory $PREFIX_DIR is not writable - cannot continue" + echo "$PREFIX_DIR is not writable - cannot continue" exit 1 fi +echo "installation directory: $PREFIX_DIR" + +export PKG_CONFIG_PATH=$PREFIX_DIR/lib/pkgconfig:$PREFIX_DIR/share/pkgconfig +export PATH=$PREFIX_DIR/bin:$PATH +export LDFLAGS=-Wl,-rpath=$PREFIX_DIR/lib +export CFLAGS="-I$PREFIX_DIR/include -fPIC -O2" + # create a downloads dir if [ ! -d downloads ]; then if ! mkdir downloads From 8e7d12ff50cbe57ebe4d429affbd4d63deb7ba66 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 8 Oct 2016 02:02:07 +0000 Subject: [PATCH 2/8] buildx.sh: "clean" is a constant string, not a semantic variable --- xorg/X11R7.6/buildx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh index 3b8e0acd..0ae62a34 100755 --- a/xorg/X11R7.6/buildx.sh +++ b/xorg/X11R7.6/buildx.sh @@ -198,7 +198,7 @@ count=0 if [ $# -lt 1 ]; then echo "" echo "usage: buildx.sh " - echo "usage: buildx.sh " + echo "usage: buildx.sh clean" echo "usage: buildx.sh default" echo "usage: buildx.sh drop - set env and run bash in rdp dir" echo "" From b2bbaef640f21f794198e83b852c7a87db067645 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 8 Oct 2016 02:02:07 +0000 Subject: [PATCH 3/8] buildx.sh: utilize all available CPUs when compiling --- xorg/X11R7.6/buildx.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh index 0ae62a34..61d2126e 100755 --- a/xorg/X11R7.6/buildx.sh +++ b/xorg/X11R7.6/buildx.sh @@ -149,7 +149,7 @@ make_it() # make module if [ ! -e cookies/$mod_name.made ]; then - if ! make -C build_dir/$mod_name + if ! make -j $NPROC -C build_dir/$mod_name then echo "" echo "make failed for module $mod_name" @@ -267,6 +267,10 @@ if [ ! -d cookies ]; then fi fi +if ! NPROC=`nproc`; then + NPROC=1 +fi + while IFS=: read mod_file mod_dir mod_args do mod_args=`eval echo $mod_args` From d602e714653dc4ce19769eb511c5afca7a2b62ba Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 8 Oct 2016 02:02:07 +0000 Subject: [PATCH 4/8] Change compilation order to resolve dependencies With this change, buildx.sh succeeds on a system without pre-existing X11 installation. --- xorg/X11R7.6/x11_file_list.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt index 0ac5744e..f7dfb4aa 100644 --- a/xorg/X11R7.6/x11_file_list.txt +++ b/xorg/X11R7.6/x11_file_list.txt @@ -6,6 +6,7 @@ libpciaccess-0.12.0.tar.bz2 : libpciaccess-0.12.0 libpthread-stubs-0.3.tar.bz2 : libpthread-stubs-0.3 : libdrm-2.4.26.tar.bz2 : libdrm-2.4.26 : damageproto-1.2.1.tar.bz2 : damageproto-1.2.1 : +xproto-7.0.20.tar.bz2 : xproto-7.0.20 : makedepend-1.0.3.tar.bz2 : makedepend-1.0.3 : libxml2-sources-2.7.8.tar.gz : libxml2-2.7.8 : libpng-1.2.46.tar.gz : libpng-1.2.46 : @@ -15,21 +16,23 @@ fontconfig-2.8.0.tar.gz : fontconfig-2.8.0 cairo-1.8.8.tar.gz : cairo-1.8.8 : expat-2.0.1.tar.gz : expat-2.0.1 : xextproto-7.1.2.tar.bz2 : xextproto-7.1.2 : -xproto-7.0.20.tar.bz2 : xproto-7.0.20 : xcb-proto-1.6.tar.bz2 : xcb-proto-1.6 : +libXau-1.0.6.tar.bz2 : libXau-1.0.6 : libxcb-1.7.tar.bz2 : libxcb-1.7 : xtrans-1.2.6.tar.bz2 : xtrans-1.2.6 : +kbproto-1.0.5.tar.bz2 : kbproto-1.0.5 : +inputproto-2.0.1.tar.bz2 : inputproto-2.0.1 : libX11-1.4.0.tar.bz2 : libX11-1.4.0 : libXext-1.2.0.tar.bz2 : libXext-1.2.0 : libICE-1.0.7.tar.bz2 : libICE-1.0.7 : libSM-1.2.0.tar.bz2 : libSM-1.2.0 : libXt-1.0.9.tar.bz2 : libXt-1.0.9 : -libXdamage-1.1.3.tar.bz2 : libXdamage-1.1.3 : +fixesproto-4.1.2.tar.bz2 : fixesproto-4.1.2 : libXfixes-4.0.5.tar.bz2 : libXfixes-4.0.5 : +libXdamage-1.1.3.tar.bz2 : libXdamage-1.1.3 : MesaLib-7.10.3.tar.bz2 : Mesa-7.10.3 : --with-expat=$PREFIX_DIR --disable-gallium randrproto-1.3.2.tar.bz2 : randrproto-1.3.2 : renderproto-0.11.1.tar.bz2 : renderproto-0.11.1 : -fixesproto-4.1.2.tar.bz2 : fixesproto-4.1.2 : xcmiscproto-1.2.1.tar.bz2 : xcmiscproto-1.2.1 : xf86vidmodeproto-2.3.tar.bz2 : xf86vidmodeproto-2.3 : xf86bigfontproto-1.2.0.tar.bz2 : xf86bigfontproto-1.2.0 : @@ -37,14 +40,11 @@ scrnsaverproto-1.2.1.tar.bz2 : scrnsaverproto-1.2.1 bigreqsproto-1.1.1.tar.bz2 : bigreqsproto-1.1.1 : resourceproto-1.1.1.tar.bz2 : resourceproto-1.1.1 : fontsproto-2.1.1.tar.bz2 : fontsproto-2.1.1 : -inputproto-2.0.1.tar.bz2 : inputproto-2.0.1 : xf86dgaproto-2.1.tar.bz2 : xf86dgaproto-2.1 : videoproto-2.3.1.tar.bz2 : videoproto-2.3.1 : compositeproto-0.4.2.tar.bz2 : compositeproto-0.4.2 : recordproto-1.14.1.tar.bz2 : recordproto-1.14.1 : xineramaproto-1.2.tar.bz2 : xineramaproto-1.2 : -libXau-1.0.6.tar.bz2 : libXau-1.0.6 : -kbproto-1.0.5.tar.bz2 : kbproto-1.0.5 : libXdmcp-1.1.0.tar.bz2 : libXdmcp-1.1.0 : libxslt-1.1.26.tar.gz : libxslt-1.1.26 : libxkbfile-1.0.7.tar.bz2 : libxkbfile-1.0.7 : @@ -63,6 +63,7 @@ applewmproto-1.4.1.tar.bz2 : applewmproto-1.4.1 bdftopcf-1.0.3.tar.bz2 : bdftopcf-1.0.3 : intltool-0.41.1.tar.gz : intltool-0.41.1 : xkeyboard-config-2.0.tar.bz2 : xkeyboard-config-2.0 : +font-util-1.2.0.tar.bz2 : font-util-1.2.0 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-adobe-75dpi-1.0.3.tar.bz2 : font-adobe-75dpi-1.0.3 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-adobe-100dpi-1.0.3.tar.bz2 : font-adobe-100dpi-1.0.3 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-adobe-utopia-75dpi-1.0.4.tar.bz2 : font-adobe-utopia-75dpi-1.0.4 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 @@ -96,6 +97,5 @@ font-schumacher-misc-1.1.2.tar.bz2 : font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4.tar.bz2 : font-screen-cyrillic-1.0.4 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-sony-misc-1.0.3.tar.bz2 : font-sony-misc-1.0.3 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-sun-misc-1.0.3.tar.bz2 : font-sun-misc-1.0.3 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 -font-util-1.2.0.tar.bz2 : font-util-1.2.0 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-winitzki-cyrillic-1.0.3.tar.bz2 : font-winitzki-cyrillic-1.0.3 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 font-xfree86-type1-1.0.4.tar.bz2 : font-xfree86-type1-1.0.4 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 From 6247a3afac8e1a629ebef93b9828054f8b069644 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 8 Oct 2016 02:02:07 +0000 Subject: [PATCH 5/8] buildx.sh: remove special case for python, it's not built anymore --- xorg/X11R7.6/buildx.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh index 61d2126e..31b1b29a 100755 --- a/xorg/X11R7.6/buildx.sh +++ b/xorg/X11R7.6/buildx.sh @@ -168,14 +168,6 @@ make_it() exit 1 fi - # special case after installing python make this sym link - # so Mesa builds using this python version - case "$mod_name" in - *Python-2*) - ln -s python build_dir/$mod_name/$PREFIX_DIR/bin/python2 - ;; - esac - touch cookies/$mod_name.installed return 0 } From 3cf67c684bd2f491ef3b06476ac63510cb049dff Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 9 Oct 2016 21:35:23 -0700 Subject: [PATCH 6/8] buildx.sh: force forward patch, don't ask whether to revert --- xorg/X11R7.6/buildx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh index 31b1b29a..ca0b29a9 100755 --- a/xorg/X11R7.6/buildx.sh +++ b/xorg/X11R7.6/buildx.sh @@ -105,7 +105,7 @@ extract_it() cd $mod_name # check for patches if [ -e ../../$mod_name.patch ]; then - patch -p1 < ../../$mod_name.patch + patch -N -p1 < ../../$mod_name.patch fi # now configure echo "executing ./configure --prefix=$PREFIX_DIR $mod_args" From 293d8b4b79acb52d045a742a0232b14156918942 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 9 Oct 2016 21:35:27 -0700 Subject: [PATCH 7/8] Add *.a to top .gitignore, add xorg/X11R7.6/.gitignore --- .gitignore | 1 + xorg/X11R7.6/.gitignore | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 xorg/X11R7.6/.gitignore diff --git a/.gitignore b/.gitignore index c76bc4f9..d3096a54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +*.a aclocal.m4 AUTHORS autom4te.cache/ diff --git a/xorg/X11R7.6/.gitignore b/xorg/X11R7.6/.gitignore new file mode 100644 index 00000000..218e4a9a --- /dev/null +++ b/xorg/X11R7.6/.gitignore @@ -0,0 +1,3 @@ +build_dir +cookies +downloads From bc5e166f134e698546113513ad0c96404f3db22c Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 9 Oct 2016 21:35:30 -0700 Subject: [PATCH 8/8] Move libXdmcp above libxcb, libxcb can use it --- xorg/X11R7.6/x11_file_list.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt index f7dfb4aa..c4e9b986 100644 --- a/xorg/X11R7.6/x11_file_list.txt +++ b/xorg/X11R7.6/x11_file_list.txt @@ -18,6 +18,7 @@ expat-2.0.1.tar.gz : expat-2.0.1 xextproto-7.1.2.tar.bz2 : xextproto-7.1.2 : xcb-proto-1.6.tar.bz2 : xcb-proto-1.6 : libXau-1.0.6.tar.bz2 : libXau-1.0.6 : +libXdmcp-1.1.0.tar.bz2 : libXdmcp-1.1.0 : libxcb-1.7.tar.bz2 : libxcb-1.7 : xtrans-1.2.6.tar.bz2 : xtrans-1.2.6 : kbproto-1.0.5.tar.bz2 : kbproto-1.0.5 : @@ -45,7 +46,6 @@ videoproto-2.3.1.tar.bz2 : videoproto-2.3.1 compositeproto-0.4.2.tar.bz2 : compositeproto-0.4.2 : recordproto-1.14.1.tar.bz2 : recordproto-1.14.1 : xineramaproto-1.2.tar.bz2 : xineramaproto-1.2 : -libXdmcp-1.1.0.tar.bz2 : libXdmcp-1.1.0 : libxslt-1.1.26.tar.gz : libxslt-1.1.26 : libxkbfile-1.0.7.tar.bz2 : libxkbfile-1.0.7 : libfontenc-1.1.0.tar.bz2 : libfontenc-1.1.0 :