Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d860b4f4
Kaydet (Commit)
d860b4f4
authored
Kas 28, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
defuzz patches to squeak by RHEL-5 patch
Change-Id: Iac990e65e3af852a527e67154c66e8ad39ce4767
üst
dd12118b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
46 deletions
+41
-46
UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk
+1
-1
i100492-freebsd.patch.1
python3/i100492-freebsd.patch.1
+28
-28
python-3.3.0-aix.patch.1
python3/python-3.3.0-aix.patch.1
+12
-17
No files found.
python3/UnpackedTarball_python3.mk
Dosyayı görüntüle @
d860b4f4
...
...
@@ -20,7 +20,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
))
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/i100492-freebsd.patch.
2
\
python3/i100492-freebsd.patch.
1
\
python3/python-3.3.0-i42553.patch.2 \
python3/python-3.3.0-aix.patch.1 \
python3/python-3.3.0-darwin.patch.1 \
...
...
python3/i100492-freebsd.patch.
2
→
python3/i100492-freebsd.patch.
1
Dosyayı görüntüle @
d860b4f4
FreeBSD porting fixes, patch by maho@openoffice.org
--- misc/Python-2.6.1/Lib/test/test_threading.py 2008-09-30 22:41:13.000000000 +0200
+++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2011-06-06 17:31:17.000000000 +0200
@@ -382,7 +382,7 @@
--- Python-3.3.0/configure 2012-11-28 09:00:41.094955090 +0000
+++ Python-3.3.0/configure 2012-11-28 09:01:13.033329526 +0000
@@ -5545,11 +5545,6 @@
LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- case $ac_sys_system in
- FreeBSD*)
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
- ;;
- esac
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
then
--- Python-3.3.0/Lib/test/test_threading.py 2012-11-28 09:00:41.292957412 +0000
+++ Python-3.3.0/Lib/test/test_threading.py 2012-11-28 09:01:13.017329339 +0000
@@ -451,7 +451,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
# on platforms known to behave badly.
...
...
@@ -11,9 +25,9 @@ FreeBSD porting fixes, patch by maho@openoffice.org
'os2emx')
def _run_and_join(self, script):
---
misc/Python-2.6.1/Python/thread_pthread.h 2006-06-13 17:04:24.000000000 +02
00
+++
misc/build/Python-2.6.1/Python/thread_pthread.h 2011-06-06 17:33:34.000000000 +02
00
@@ -
26,6 +26
,10 @@
---
Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +00
00
+++
Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:01:13.018329351 +00
00
@@ -
42,6 +42
,10 @@
#endif
#endif
...
...
@@ -23,8 +37,8 @@ FreeBSD porting fixes, patch by maho@openoffice.org
+
/* The POSIX spec says that implementations supporting the sem_*
family of functions must indicate this by defining
_POSIX_SEMAPHORES. */
@@ -
44,7 +48
,6 @@
_POSIX_SEMAPHORES. */
@@ -
60,7 +64
,6 @@
in default setting. So the process scope is preferred to get
enough number of threads to work. */
#ifdef __FreeBSD__
...
...
@@ -32,7 +46,7 @@ FreeBSD porting fixes, patch by maho@openoffice.org
#if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
#undef PTHREAD_SYSTEM_SCHED_SUPPORTED
#endif
@@ -1
49,6 +152
,9 @@
@@ -1
86,6 +189
,9 @@
{
pthread_t th;
int status;
...
...
@@ -42,7 +56,7 @@ FreeBSD porting fixes, patch by maho@openoffice.org
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_t attrs;
#endif
@@ -
177,7 +183
,10 @@
@@ -
214,7 +220
,10 @@
#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
#endif
...
...
@@ -54,27 +68,13 @@ FreeBSD porting fixes, patch by maho@openoffice.org
status = pthread_create(&th,
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
&attrs,
@@ -
188,6 +197
,9 @@
(void *)arg
);
@@ -
225,6 +234
,9 @@
(void *)arg
);
+#ifdef __FreeBSD__
+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
+#endif
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
pthread_attr_destroy(&attrs);
#endif
--- misc/Python-2.6.1/configure 2008-11-16 18:57:10.000000000 +0100
+++ misc/build/Python-2.6.1/configure 2011-06-06 17:31:17.000000000 +0200
@@ -4110,11 +4110,6 @@
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- case $ac_sys_system in
- FreeBSD*)
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
- ;;
- esac
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
python3/python-3.3.0-aix.patch.1
Dosyayı görüntüle @
d860b4f4
build with GCC on AIX
diff -ru python3.old_/configure python3/configure
--- python3.old_/configure 2012-09-29 10:00:50.000000000 +0200
+++ python3/configure 2012-11-13 19:28:25.869753237 +0100
--- Python-3.3.0/configure 2012-11-28 09:05:45.990529603 +0000
+++ Python-3.3.0/configure 2012-11-28 09:06:23.037963934 +0000
@@ -3426,8 +3426,6 @@
else
...
...
@@ -34,7 +33,7 @@ diff -ru python3.old_/configure python3/configure
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
then
@@ -61
74,7 +6180
,7 @@
@@ -61
69,7 +6175
,7 @@
# debug builds.
OPT="-g -O0 -Wall $STRICT_PROTO"
else
...
...
@@ -43,7 +42,7 @@ diff -ru python3.old_/configure python3/configure
fi
;;
*)
@@ -830
6,8 +8312
,13 @@
@@ -830
1,8 +8307
,13 @@
then
case $ac_sys_system/$ac_sys_release in
AIX*)
...
...
@@ -59,9 +58,8 @@ diff -ru python3.old_/configure python3/configure
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
diff -ru python3.old_/configure.ac python3/configure.ac
--- python3.old_/configure.ac 2012-09-29 10:00:50.000000000 +0200
+++ python3/configure.ac 2012-11-13 19:28:36.273753536 +0100
--- Python-3.3.0/configure.ac 2012-11-28 09:05:45.990529603 +0000
+++ Python-3.3.0/configure.ac 2012-11-28 09:06:23.038963946 +0000
@@ -545,8 +545,6 @@
without_gcc=$withval;;
esac], [
...
...
@@ -109,9 +107,8 @@ diff -ru python3.old_/configure.ac python3/configure.ac
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
diff -ru python3.old_/Makefile.pre.in python3/Makefile.pre.in
--- python3.old_/Makefile.pre.in 2012-09-29 10:00:41.000000000 +0200
+++ python3/Makefile.pre.in 2012-11-13 19:10:10.733742599 +0100
--- Python-3.3.0/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000
+++ Python-3.3.0/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000
@@ -493,7 +493,10 @@
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
...
...
@@ -133,9 +130,8 @@ diff -ru python3.old_/Makefile.pre.in python3/Makefile.pre.in
export EXE; EXE="$(BUILDEXE)"; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
diff -ru python3.old_/Modules/_ctypes/libffi/fficonfig.py.in python3/Modules/_ctypes/libffi/fficonfig.py.in
--- python3.old_/Modules/_ctypes/libffi/fficonfig.py.in 2012-09-29 10:00:42.000000000 +0200
+++ python3/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-13 19:09:25.252740861 +0100
--- Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:05:45.889528418 +0000
+++ Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:06:23.046964040 +0000
@@ -16,7 +16,7 @@
'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
...
...
@@ -145,9 +141,8 @@ diff -ru python3.old_/Modules/_ctypes/libffi/fficonfig.py.in python3/Modules/_ct
'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist
--- python3.old_/Modules/Setup.dist 2012-09-29 10:00:42.000000000 +0200
+++ python3/Modules/Setup.dist 2012-11-13 19:09:25.251740860 +0100
--- Python-3.3.0/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000
+++ Python-3.3.0/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000
@@ -177,7 +177,7 @@
#_bisect _bisectmodule.c # Bisection algorithms
#_heapq _heapqmodule.c # Heap queue algorithm
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment