diff options
| author | Al Stone <ahs3@redhat.com> | 2012-11-13 14:13:38 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2012-11-13 14:13:38 -0700 |
| commit | cf8085e01747c15db596b2cd526e9acf6b381db8 (patch) | |
| tree | 6fbde168aea229cb964739910e47adcce78bc7b8 /recipe.d | |
| parent | 48387a3427922660af655fb9bdf4b1d4d44067ac (diff) | |
| parent | 90c5a8046f7c788b698765608dcc582f01567988 (diff) | |
| download | bootstrap.git.DONOTUSE-cf8085e01747c15db596b2cd526e9acf6b381db8.tar.gz bootstrap.git.DONOTUSE-cf8085e01747c15db596b2cd526e9acf6b381db8.tar.xz bootstrap.git.DONOTUSE-cf8085e01747c15db596b2cd526e9acf6b381db8.zip | |
Merge branch 'aarch64-ahs3' into aarch64-jcmaarch64-jcm
First step in merging into master
Diffstat (limited to 'recipe.d')
| -rw-r--r-- | recipe.d/0006-texinfo | 4 | ||||
| -rw-r--r-- | recipe.d/0007-gdb | 6 | ||||
| -rw-r--r-- | recipe.d/0010-pcre | 3 | ||||
| -rw-r--r-- | recipe.d/0012-chkconfig | 12 |
4 files changed, 18 insertions, 7 deletions
diff --git a/recipe.d/0006-texinfo b/recipe.d/0006-texinfo index 677c80b..ac911bc 100644 --- a/recipe.d/0006-texinfo +++ b/recipe.d/0006-texinfo @@ -2,6 +2,10 @@ mcd $BUILDDIR/texinfo $SRC/texinfo-*/configure $TCONFIGARGS + # texi2dvi has been touched so the builder + # will try to rebuild the man page from texi2dvi but that + # spits out only a warning that no tex system is installed + touch doc/texi2dvi.1 make $J -k make $J -k install diff --git a/recipe.d/0007-gdb b/recipe.d/0007-gdb index cdaf9bf..5e9671b 100644 --- a/recipe.d/0007-gdb +++ b/recipe.d/0007-gdb @@ -5,7 +5,11 @@ #requires texinfo mcd $BUILDDIR/gdb - $SRC/gdb-*/configure $TCONFIGARGS --without-rpm --with-system-readline + OTHERARGS="--disable-gdbserver --disable-multi-ice \ + --without-expat --without-python --without-tcl \ + --without-tk --without-x --disable-gtk \ + --without-rpm --with-system-readline" + $SRC/gdb-*/configure $TCONFIGARGS $OTHERARGS notparallel make $J -k make $J -k install diff --git a/recipe.d/0010-pcre b/recipe.d/0010-pcre index 9f3b6bf..2a3ff4b 100644 --- a/recipe.d/0010-pcre +++ b/recipe.d/0010-pcre @@ -6,5 +6,6 @@ rm -f /usr/share/man/man3/pcre* || true mcd $BUILDDIR/pcre $SRC/pcre-*/configure $TCONFIGARGS make $J - make $J install + #make $J install + make $J install-exec install-includeHEADERS install-nodist_includeHEADERS install-pkgconfigDATA diff --git a/recipe.d/0012-chkconfig b/recipe.d/0012-chkconfig index 4a5686e..c35a3d3 100644 --- a/recipe.d/0012-chkconfig +++ b/recipe.d/0012-chkconfig @@ -1,6 +1,8 @@ -mcd $BUILDDIR/chkconfig -cp -rp $SRC/chkconfig-*/* . -sed '/install.*ntsysv/d; /all/s/ntsysv//' Makefile > Makefile.stage2 -make -f Makefile.stage2 $J CC=gcc -make -f Makefile.stage2 $J -k install || true +#requires popt + + mcd $BUILDDIR/chkconfig + cp -rp $SRC/chkconfig-*/* . + sed '/install.*ntsysv/d; /all/s/ntsysv//' Makefile > Makefile.stage2 + make -f Makefile.stage2 $J CC=gcc + make -f Makefile.stage2 $J -k install || true |