Explorar el Código

Disable automatic cross platform pthread support by removing ACX_PTHREAD and acx_pthread.m4.

Michael Schloh von Bennewitz hace 23 años
padre
commit
1c15cc723c
Se han modificado 1 ficheros con 1 adiciones y 20 borrados
  1. 1 20
      autoconf/autoconf.spec

+ 1 - 20
autoconf/autoconf.spec

@@ -26,11 +26,6 @@
 %define       V_latest 2.54
 %define       V_old    2.13
 
-#   package options
-%ifndef       with_acx_pthread
-%define       with_acx_pthread no
-%endif
-
 #   package information
 Name:         autoconf
 Summary:      GNU Source Autoconfiguration
@@ -41,12 +36,11 @@ Distribution: OpenPKG [CORE]
 Group:        Development
 License:      GPL
 Version:      %{V_latest}
-Release:      20021021
+Release:      20021022
 
 #   list of sources
 Source1:      ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz
 Source0:      ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_old}.tar.gz
-Source2:      http://www.gnu.org/software/ac-archive/Installed_Packages/acx_pthread.m4
 Patch0:       autoconf-%{V_old}.patch
 
 #   build information
@@ -64,21 +58,11 @@ AutoReqProv:  no
     is mostly needed by people producing packages that run on a wide
     variety of platforms--particularly UNIX-a-likes.
 
-    Options:
-    --define 'with_acx_pthread      %{with_acx_pthread}'
-
 %prep
     %setup0 -q -c -n autoconf-%{V_latest}
     %setup1 -q -T -D -a 1
     cd autoconf-%{V_old}
     %{l_patch} -p0 <%{SOURCE autoconf-%{V_old}.patch}
-%if "%{with_acx_pthread}" == "yes"
-    ( cd ../autoconf-%{V_latest}/lib/autoconf
-      cp -rp %{SOURCE acx_pthread.m4} .
-      cat autoconf.m4 | %{l_sed} -e '69a\
-m4_include([autoconf/acx_pthread.m4])' >autoconf.m4
-    )
-%endif
 
 %build
     ( cd autoconf-%{V_old}
@@ -112,9 +96,6 @@ m4_include([autoconf/acx_pthread.m4])' >autoconf.m4
       %{l_make} %{l_mflags} install \
           prefix=$RPM_BUILD_ROOT%{l_prefix}
     )
-%if "%{with_acx_pthread}" == "yes"
-    cp -rp %{SOURCE acx_pthread.m4} $RPM_BUILD_ROOT%{l_prefix}/share/autoconf/autoconf
-%endif
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}