Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
6c96625489
6 changed files with 44 additions and 3 deletions
  1. +1
    -0
      Documentation/Developers/PKG-BUILD-VARS
  2. +26
    -0
      architecture/x86/parse-config
  3. +1
    -1
      package/base/e2fsprogs/e2fsprogs.conf
  4. +9
    -0
      package/base/gcc/parse-config
  5. +0
    -1
      package/base/zlib/zlib.conf
  6. +7
    -1
      scripts/Build-Pkg

+ 1
- 0
Documentation/Developers/PKG-BUILD-VARS

@ -67,6 +67,7 @@ taropt ........ tar options for extracting
createprefix .. '0' = skip creation for directory skeleton for $prefix
createdocs .... '0' = skip automatic copying of documentation files
autoso2a ...... '1' = automatically create *.a files for all *.so files
forcefpic ..... set to '0' to disable the force -fPIC mechanism
custmain ...... command to execute instead of 'configure, make, make install'
mainfunction .. alternate main function instead of build_this_package()

+ 26
- 0
architecture/x86/parse-config

@ -0,0 +1,26 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/architecture/x86/parse-config
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
if [ "$ROCKCFG_X86_BITS" = 64 -a "$forcefpic" = "" ]; then
forcefpic="1"
fi

+ 1
- 1
package/base/e2fsprogs/e2fsprogs.conf

@ -25,7 +25,7 @@ if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then
[ "$dietlibc_dynamic_static" = "dynamic" ] && confopt="$confopt --enable-dynamic-e2fsck"
fi
confopt="$confopt --with-ccopts=-fPIC --enable-fsck --libdir=$root/lib --with-root-prefix=$root/"
confopt="$confopt --enable-fsck --libdir=$root/lib --with-root-prefix=$root/"
if [ $stagelevel -gt 1 -o "$crossnative" == "cross" ] ;
then

+ 9
- 0
package/base/gcc/parse-config

@ -142,5 +142,14 @@ if [ $stagelevel -gt 1 -a "$ROCKCFG_PSEUDONATIVE" = 1 ]; then
var_insert GCC_WRAPPER_INSERT " " "--specs=specs.chroot"
fi
# register the forcefpic handler
gcc_force_fpic_handler() {
if [ "$forcefpic" = 1 ]; then
# echo_status "Enabling force -fPIC mechanism for gcc."
var_insert GCC_WRAPPER_INSERT " " "-fPIC"
fi
}
hook_add prepare 7 'gcc_force_fpic_handler'
# ---- NOT IN STAGE 0 ---
fi

+ 0
- 1
package/base/zlib/zlib.conf

@ -31,7 +31,6 @@ zlib_pm() {
}
var_insert confopt " " "--shared"
var_insert CC_WRAPPER_INSERT " " "-fPIC"
var_append makeinstopt " " "mandir=$mandir"
hook_add preconf 3 "unset AR"
hook_add postmake 3 "zlib_pm"

+ 7
- 1
scripts/Build-Pkg

@ -528,7 +528,7 @@ taropt="--use-compress-program=bzip2 -xf"
mainfunction="build_this_package"
runconf=1 ; runxmkmf=1 ; runmkpl=1 ; runpysetup=1 ; autopatch=1
autoextract=1 ; chownsrcdir=1 ; nocvsinsrcdir=1; patchopt="-bfp1 -z .orig"
createprefix=1 ; createdocs="" ; rmemptydir="" ; autoso2a=0
createprefix=1 ; createdocs="" ; rmemptydir="" ; autoso2a=0 ; forcefpic=""
check_shared=1
check_usrlocal=1
@ -576,6 +576,12 @@ if [ $stagelevel -eq 0 ]; then
createdocs=0
fi
if [ -f $confdir/$pkg.cache ]; then
if ! egrep -q '^\[PROVIDES].*\.so( |$)' $confdir/$pkg.cache; then
forcefpic="0"
fi
fi
if [ $stagelevel -gt 1 ]; then
for pc_file in $xroot/var/adm/parse-config/* ; do
if [ -s "$pc_file" -a "${pc_file##*/}" != "$xpkg" ]

Loading…
Cancel
Save