Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f25cf6c

Browse files
naschemenascheme
committed
Add Python/ prefix to files in LIBOBJS. This closes SF bug "[ #404827 ] Python
Makefile: LIBOBJS incorrect".
1 parent 243bff4 commit f25cf6c

2 files changed

Lines changed: 40 additions & 26 deletions

File tree

‎configure‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# From configure.in Revision: 1.206
3+
# From configure.in Revision: 1.207
44

55
# Guess values for system-dependent variables and create Makefiles.
66
# Generated automatically using autoconf version 2.13
@@ -3419,7 +3419,7 @@ EOF
34193419
#define C_THREADS 1
34203420
EOF
34213421

3422-
LIBOBJS="$LIBOBJS Python/thread.o"
3422+
LIBOBJS="$LIBOBJS thread.o"
34233423
else
34243424
echo "$ac_t""no" 1>&6
34253425

@@ -3439,7 +3439,7 @@ EOF
34393439
EOF
34403440

34413441
LIBS="-lpth $LIBS"
3442-
LIBOBJS="$LIBOBJS Python/thread.o"
3442+
LIBOBJS="$LIBOBJS thread.o"
34433443
else
34443444

34453445
echo "$ac_t""no" 1>&6
@@ -3487,7 +3487,7 @@ EOF
34873487
EOF
34883488

34893489
LIBS="-lpthread $LIBS"
3490-
LIBOBJS="$LIBOBJS Python/thread.o"
3490+
LIBOBJS="$LIBOBJS thread.o"
34913491
else
34923492
echo "$ac_t""no" 1>&6
34933493

@@ -3545,7 +3545,7 @@ EOF
35453545
EOF
35463546
;;
35473547
esac
3548-
LIBOBJS="$LIBOBJS Python/thread.o"
3548+
LIBOBJS="$LIBOBJS thread.o"
35493549
else
35503550
echo "$ac_t""no" 1>&6
35513551

@@ -3585,7 +3585,7 @@ EOF
35853585
#define BEOS_THREADS 1
35863586
EOF
35873587

3588-
LIBOBJS="$LIBOBJS Python/thread.o"
3588+
LIBOBJS="$LIBOBJS thread.o"
35893589
else
35903590
echo "$ac_t""no" 1>&6
35913591

@@ -3633,7 +3633,7 @@ EOF
36333633
EOF
36343634

36353635
LIBS="$LIBS -lpthreads"
3636-
LIBOBJS="$LIBOBJS Python/thread.o"
3636+
LIBOBJS="$LIBOBJS thread.o"
36373637
else
36383638
echo "$ac_t""no" 1>&6
36393639

@@ -3681,7 +3681,7 @@ EOF
36813681
EOF
36823682

36833683
LIBS="$LIBS -lc_r"
3684-
LIBOBJS="$LIBOBJS Python/thread.o"
3684+
LIBOBJS="$LIBOBJS thread.o"
36853685
else
36863686
echo "$ac_t""no" 1>&6
36873687

@@ -3729,7 +3729,7 @@ EOF
37293729
EOF
37303730

37313731
LIBS="$LIBS -lthread"
3732-
LIBOBJS="$LIBOBJS Python/thread.o"
3732+
LIBOBJS="$LIBOBJS thread.o"
37333733
else
37343734
echo "$ac_t""no" 1>&6
37353735

@@ -3777,7 +3777,7 @@ EOF
37773777
EOF
37783778

37793779
LIBS="$LIBS -lpthread"
3780-
LIBOBJS="$LIBOBJS Python/thread.o"
3780+
LIBOBJS="$LIBOBJS thread.o"
37813781
else
37823782
echo "$ac_t""no" 1>&6
37833783

@@ -3825,7 +3825,7 @@ EOF
38253825
EOF
38263826

38273827
LIBS="$LIBS -lcma"
3828-
LIBOBJS="$LIBOBJS Python/thread.o"
3828+
LIBOBJS="$LIBOBJS thread.o"
38293829
else
38303830
echo "$ac_t""no" 1>&6
38313831

@@ -3892,7 +3892,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
38923892
EOF
38933893

38943894
LIBS="$LIBS -lmpc"
3895-
LIBOBJS="$LIBOBJS Python/thread.o"
3895+
LIBOBJS="$LIBOBJS thread.o"
38963896
USE_THREAD_MODULE=""
38973897
else
38983898
echo "$ac_t""no" 1>&6
@@ -3938,7 +3938,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
39383938
EOF
39393939

39403940
LIBS="$LIBS -lthread"
3941-
LIBOBJS="$LIBOBJS Python/thread.o"
3941+
LIBOBJS="$LIBOBJS thread.o"
39423942
USE_THREAD_MODULE=""
39433943
else
39443944
echo "$ac_t""no" 1>&6
@@ -6156,6 +6156,13 @@ EOF
61566156
fi
61576157

61586158

6159+
# Add Python/ prefix to LIBOBJS
6160+
libobjs=$LIBOBJS
6161+
LIBOBJS=
6162+
for obj in $libobjs; do
6163+
LIBOBJS="$LIBOBJS Python/$obj"
6164+
done
6165+
61596166
#AC_MSG_CHECKING(for Modules/Setup)
61606167
#if test ! -f Modules/Setup ; then
61616168
# if test ! -d Modules ; then
@@ -6170,7 +6177,7 @@ fi
61706177

61716178
SRCDIRS="Parser Grammar Objects Python Modules"
61726179
echo $ac_n "checking for build directories""... $ac_c" 1>&6
6173-
echo "configure:6174: checking for build directories" >&5
6180+
echo "configure:6181: checking for build directories" >&5
61746181
for dir in $SRCDIRS; do
61756182
if test ! -d $dir; then
61766183
mkdir $dir

‎configure.in‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -773,59 +773,59 @@ else
773773
AC_DEFINE(_REENTRANT)
774774
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
775775
AC_DEFINE(C_THREADS)
776-
LIBOBJS="$LIBOBJS Python/thread.o"],[
776+
LIBOBJS="$LIBOBJS thread.o"],[
777777
AC_MSG_CHECKING(for --with-pth)
778778
AC_ARG_WITH(pth,
779779
[ --with-pth use GNU pth threading libraries], [
780780
AC_MSG_RESULT($withval)
781781
AC_DEFINE(WITH_THREAD)
782782
AC_DEFINE(HAVE_PTH)
783783
LIBS="-lpth $LIBS"
784-
LIBOBJS="$LIBOBJS Python/thread.o"],[
784+
LIBOBJS="$LIBOBJS thread.o"],[
785785
AC_MSG_RESULT(no)
786786
AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
787787
AC_DEFINE(_POSIX_THREADS)
788788
LIBS="-lpthread $LIBS"
789-
LIBOBJS="$LIBOBJS Python/thread.o"],[
789+
LIBOBJS="$LIBOBJS thread.o"],[
790790
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
791791
case $ac_sys_system in
792792
Darwin*) ;;
793793
*) AC_DEFINE(_POSIX_THREADS);;
794794
esac
795-
LIBOBJS="$LIBOBJS Python/thread.o"],[
795+
LIBOBJS="$LIBOBJS thread.o"],[
796796
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
797797
AC_DEFINE(BEOS_THREADS)
798-
LIBOBJS="$LIBOBJS Python/thread.o"],[
798+
LIBOBJS="$LIBOBJS thread.o"],[
799799
AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
800800
AC_DEFINE(_POSIX_THREADS)
801801
LIBS="$LIBS -lpthreads"
802-
LIBOBJS="$LIBOBJS Python/thread.o"], [
802+
LIBOBJS="$LIBOBJS thread.o"], [
803803
AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
804804
AC_DEFINE(_POSIX_THREADS)
805805
LIBS="$LIBS -lc_r"
806-
LIBOBJS="$LIBOBJS Python/thread.o"], [
806+
LIBOBJS="$LIBOBJS thread.o"], [
807807
AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
808808
AC_DEFINE(_POSIX_THREADS)
809809
LIBS="$LIBS -lthread"
810-
LIBOBJS="$LIBOBJS Python/thread.o"], [
810+
LIBOBJS="$LIBOBJS thread.o"], [
811811
AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
812812
AC_DEFINE(_POSIX_THREADS)
813813
LIBS="$LIBS -lpthread"
814-
LIBOBJS="$LIBOBJS Python/thread.o"], [
814+
LIBOBJS="$LIBOBJS thread.o"], [
815815
AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
816816
AC_DEFINE(_POSIX_THREADS)
817817
LIBS="$LIBS -lcma"
818-
LIBOBJS="$LIBOBJS Python/thread.o"],[
818+
LIBOBJS="$LIBOBJS thread.o"],[
819819
USE_THREAD_MODULE="#"])
820820
])])])])])])])])])
821821

822822
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
823823
LIBS="$LIBS -lmpc"
824-
LIBOBJS="$LIBOBJS Python/thread.o"
824+
LIBOBJS="$LIBOBJS thread.o"
825825
USE_THREAD_MODULE=""])
826826
AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
827827
LIBS="$LIBS -lthread"
828-
LIBOBJS="$LIBOBJS Python/thread.o"
828+
LIBOBJS="$LIBOBJS thread.o"
829829
USE_THREAD_MODULE=""])
830830

831831
if test "$USE_THREAD_MODULE" != "#"
@@ -1293,6 +1293,13 @@ cat >> confdefs.h <<\EOF
12931293
EOF
12941294
AC_CHECK_TYPE(socklen_t, int)
12951295

1296+
# Add Python/ prefix to LIBOBJS
1297+
libobjs=$LIBOBJS
1298+
LIBOBJS=
1299+
for obj in $libobjs; do
1300+
LIBOBJS="$LIBOBJS Python/$obj"
1301+
done
1302+
12961303
#AC_MSG_CHECKING(for Modules/Setup)
12971304
#if test ! -f Modules/Setup ; then
12981305
# if test ! -d Modules ; then

0 commit comments

Comments
 (0)