OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   24-Dec-2009 22:05:11
  Branch: HEAD                             Handle: 2009122421050700

  Modified files:
    openpkg-src/openpkg-darwin
                            openpkg-darwin.spec

  Log:
    improve packaging

  Summary:
    Revision    Changes     Path
    1.2         +27 -9      openpkg-src/openpkg-darwin/openpkg-darwin.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-darwin/openpkg-darwin.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 openpkg-darwin.spec
  --- openpkg-src/openpkg-darwin/openpkg-darwin.spec    24 Dec 2009 20:47:21 
-0000      1.1
  +++ openpkg-src/openpkg-darwin/openpkg-darwin.spec    24 Dec 2009 21:05:07 
-0000      1.2
  @@ -45,7 +45,9 @@
   Provides:     gcc = %{version}
   
   %description
  -    openpkg-darwin is the most badly packaged program in the OpenPKG world.
  +    This package is a cruel hack until GNU binutils and GNU gcc really
  +    support Darwin / Mac OS X: it proxies the Darwin occtools and gcc
  +    tools as the OpenPKG "binutils" and "gcc" virtual packages.
   
   %track
       prog openpkg-darwin = {
  @@ -66,14 +68,30 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/man/man1
  -    for tool in cpp gcov c%{l_nil}c gcc c++ g++ \
  -        ar ld as gprof nm ranlib size strip strings; do
  -        %{l_shtool} mkln -s \
  -            /usr/bin/$tool \
  -            $RPM_BUILD_ROOT%{l_prefix}/bin/$tool
  -        %{l_shtool} mkln -s \
  -            /usr/share/man/man1/$tool.1 \
  -            $RPM_BUILD_ROOT%{l_prefix}/man/man1/$tool.1
  +    for tool in c%{l_nil}c gcc c++ g++; do
  +        (   echo "#!/bin/sh"
  +            echo "case \" \$* \" in"
  +            echo "    *\" -c \"* | *\" -E \"* ) exec /usr/bin/$tool 
\${1+\"\...@\"} ;;"
  +            echo "    * ) exec /usr/bin/$tool -Wl,-search_paths_first 
\${1+\"\...@\"} ;;"
  +            echo "esac"
  +        ) >$tool
  +        %{l_shtool} install -c -m 755 \
  +            $tool $RPM_BUILD_ROOT%{l_prefix}/bin/$tool
  +    done
  +    for tool in ld; do
  +        (   echo "#!/bin/sh"
  +            echo "exec /usr/bin/ld -search_paths_first \${1+\"\...@\"}"
  +        ) >$tool
  +        %{l_shtool} install -c -m 755 \
  +            $tool $RPM_BUILD_ROOT%{l_prefix}/bin/$tool
  +    done
  +    for tool in cpp gcov \
  +        ar as gprof nm ranlib size strip strings; do
  +        (   echo "#!/bin/sh"
  +            echo "exec /usr/bin/$tool \${1+\"\...@\"}"
  +        ) >$tool
  +        %{l_shtool} install -c -m 755 \
  +            $tool $RPM_BUILD_ROOT%{l_prefix}/bin/$tool
       done
       for tool in objcopy objdump readelf; do
           (   echo "#!/bin/sh"
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to