commit ce65aeaf600ea84e7c3169c666bb8aebdf61f7e8 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Mar 12 19:36:06 2015 +1100 distcc: use internal popt library, make python an optional dependency for pump mode diff --git a/distcc/.footprint b/distcc/.footprint index fb5835d..f9ea8eb 100644 --- a/distcc/.footprint +++ b/distcc/.footprint @@ -6,7 +6,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/distcc -rwxr-xr-x root/root usr/bin/distccmon-text -rwxr-xr-x root/root usr/bin/lsdistcc --rwxr-xr-x root/root usr/bin/pump drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/distcc/ lrwxrwxrwx root/root usr/lib/distcc/c++ -> ../../bin/distcc @@ -14,65 +13,10 @@ lrwxrwxrwx root/root usr/lib/distcc/cc -> ../../bin/distcc lrwxrwxrwx root/root usr/lib/distcc/cpp -> ../../bin/distcc lrwxrwxrwx root/root usr/lib/distcc/g++ -> ../../bin/distcc lrwxrwxrwx root/root usr/lib/distcc/gcc -> ../../bin/distcc -drwxr-xr-x root/root usr/lib/python2.7/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server-3.1-py2.7.egg-info -drwxr-xr-x root/root usr/lib/python2.7/site-packages/include_server/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/__init__.py (EMPTY) --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/__init__.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/c_extensions_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/c_extensions_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/cache_basics.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/cache_basics.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compiler_defaults.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compiler_defaults.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compress_files.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compress_files.pyc --rwxr-xr-x root/root usr/lib/python2.7/site-packages/include_server/distcc_pump_c_extensions.so --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/run.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/run.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/setup.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/setup.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/statistics.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/statistics.pyc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/distcc.1.gz -rw-r--r-- root/root usr/man/man1/distccd.1.gz -rw-r--r-- root/root usr/man/man1/distccmon-text.1.gz --rw-r--r-- root/root usr/man/man1/include_server.1.gz --rw-r--r-- root/root usr/man/man1/pump.1.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/distccd diff --git a/distcc/Pkgfile b/distcc/Pkgfile index 922a055..e12d033 100644 --- a/distcc/Pkgfile +++ b/distcc/Pkgfile @@ -2,11 +2,11 @@ # URL: http://distcc.org/ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Johannes Winkelmann, jw at tks6 dot net -# Depends on: popt python +# Optional: python name=distcc version=3.1 -release=3 +release=4 source=(http://distcc.googlecode.com/files/$name-$version.tar.bz2 distccd) @@ -19,7 +19,8 @@ build() { --disable-nls \ --without-gnome \ --without-gtk \ - --disable-Werror + --disable-Werror \ + --with-included-popt make make DESTDIR=$PKG install @@ -41,4 +42,9 @@ build() { rm -rf $PKG/usr/share/doc $PKG/usr/etc/default $PKG/usr/etc/distcc rmdir $PKG/usr/etc $PKG/usr/share + + # python is required for pump mode + if [ "$(prt-get isinst python)" = 'package python is not installed' ]; then + rm $PKG/usr/man/man1/{pump,include_server}.1 + fi }