Changeset 624 for spec/trunk/SPECS/python.spec

Timestamp:

Dec 22, 2015, 12:41:18 PM (10 years ago)

Author:

Yuri Dario

Message:

spec: undo wrong commit r623.

File:

• spec/trunk/SPECS/python.spec (modified) (4 diffs)

spec/trunk/SPECS/python.spec

@@ -1 @@
-#define svn_url     F:/rd/rpm/python/trunk
-%define svn_url     http://svn.netlabs.org/repos/rpm/python/trunk
-%define svn_rev     568
-
 %{!?__python_ver:%global __python_ver EMPTY}
 #global __python_ver 2.7
@@ -256 +252 @@
 export CONFIG_SITE="/@unixroot/usr/share/config.legacy"
 export LDFLAGS="-g -Zbin-files -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp"
-export LIBS="-lssl -lcrypto -lurpo -lpthread -lintl"
+export LIBS="-lssl -lcrypto -lurpo -lmmap -lpthread -lintl"
 %configure \
         --enable-shared \
         --with-system-expat \
-        --with-system-ffi
+        --with-system-ffi --with-libs='-lmmap'
 
 make OPT="$CFLAGS" %{?_smp_mflags}
@@ -584 +580 @@
 
 %changelog
-<<<<<<< .mine
-* Tue Apr 07 2015 yd <yd@os2power.com> 2.7.6-12
-- r568, build mmap module, by psmedley.
-
-=======
 * Fri Dec 12 2015 Dmitriy Kuminov <coding@dmik.org> 2.7.6-12
 - Provide dummy _dlopen in ctypes to make colorama package happy.
@@ -598 +589 @@
 - Make os.path.defpath return '$UNIXROOT\\usr\\bin'.
 
->>>>>>> .r622
 * Thu Feb 26 2015 yd <yd@os2power.com> 2.7.6-11
 - r560, -O3 breaks the build, at least for pentium4 march.