History

configure: Prefix libc-related variables with "libc_"

Simplifies host/target libc detection splitting.

Diego Biurrun committed 12 years ago

Commit d64341e1 parent 61b203f5 files · +11 −12Browse files

Unified · Split

5 files
  1. configure +5 −5
  2. libavcodec/Makefile +1 −2
  3. libavdevice/Makefile +2 −2
  4. libavformat/Makefile +2 −2
  5. libavutil/internal.h +1 −1
configure+5−5
@@ -1332,6 +1332,7 @@ HAVE_LIST=" · 1331 unmodified lines
1332 isatty1332 isatty
1333 jack_port_get_latency_range1333 jack_port_get_latency_range
1334 ldbrx1334 ldbrx
1335 libc_msvcrt
1335 libdc1394_11336 libdc1394_1
1336 libdc1394_21337 libdc1394_2
1337 local_aligned_161338 local_aligned_16
@@ -1349,7 +1350,6 @@ HAVE_LIST=" · 11 unmodified lines
1349 mm_empty1350 mm_empty
1350 mmap1351 mmap
1351 mprotect1352 mprotect
1352 msvcrt
1353 nanosleep1353 nanosleep
1354 poll_h1354 poll_h
1355 posix_memalign1355 posix_memalign
@@ -1557,7 +1557,7 @@ need_memalign="altivec neon sse" · 201 unmodified lines
1557 1557
1558symver_if_any="symver_asm_label symver_gnu_asm"1558symver_if_any="symver_asm_label symver_gnu_asm"
1559 1559
1560log2_deps="!msvcrt"1560log2_deps="!libc_msvcrt"
1561 1561
1562# subsystems1562# subsystems
1563dct_select="rdft"1563dct_select="rdft"
@@ -3413,7 +3413,7 @@ elif check_cpp_condition sys/brand.h "defined SOLARIS_BRAND_NAME"; then · 1849 unmodified lines
3413 add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=6003413 add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
3414fi3414fi
3415 3415
3416test -n "$libc_type" && enable $libc_type3416test -n "$libc_type" && enable libc_$libc_type
3417 3417
3418case $libc_type in3418case $libc_type in
3419 bionic)3419 bionic)
@@ -3429,7 +3429,7 @@ esac · 9 unmodified lines
3429 3429
3430# hacks for compiler/libc/os combinations3430# hacks for compiler/libc/os combinations
3431 3431
3432if enabled_all tms470 glibc; then3432if enabled_all tms470 libc_glibc; then
3433 CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"3433 CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
3434 add_cppflags -D__USER_LABEL_PREFIX__=3434 add_cppflags -D__USER_LABEL_PREFIX__=
3435 add_cppflags -D__builtin_memset=memset3435 add_cppflags -D__builtin_memset=memset
@@ -3437,7 +3437,7 @@ if enabled_all tms470 glibc; then · 1 unmodified line
3437 add_cflags -pds=48 # incompatible redefinition of macro3437 add_cflags -pds=48 # incompatible redefinition of macro
3438fi3438fi
3439 3439
3440if enabled_all ccc glibc; then3440if enabled_all ccc libc_glibc; then
3441 add_ldflags -Wl,-z,now # calls to libots crash without this3441 add_ldflags -Wl,-z,now # calls to libots crash without this
3442fi3442fi
3443 3443
libavcodec/Makefile+1−2
@@ -25,8 +25,6 @@ OBJS = allcodecs.o \ · 24 unmodified lines
25 raw.o \25 raw.o \
26 utils.o \26 utils.o \
27 27
28OBJS-$(HAVE_MSVCRT) += file_open.o
29
30# parts needed for many different codecs28# parts needed for many different codecs
31OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o29OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
32OBJS-$(CONFIG_AC3DSP) += ac3dsp.o30OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
@@ -677,6 +675,7 @@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o · 644 unmodified lines
677OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o675OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o
678 676
679# thread libraries677# thread libraries
678OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
680OBJS-$(HAVE_PTHREADS) += pthread.o pthread_slice.o pthread_frame.o679OBJS-$(HAVE_PTHREADS) += pthread.o pthread_slice.o pthread_frame.o
681OBJS-$(HAVE_W32THREADS) += pthread.o pthread_slice.o pthread_frame.o680OBJS-$(HAVE_W32THREADS) += pthread.o pthread_slice.o pthread_frame.o
682 681
libavdevice/Makefile+2−2
@@ -7,8 +7,6 @@ HEADERS = avdevice.h \ · 6 unmodified lines
7OBJS = alldevices.o \7OBJS = alldevices.o \
8 avdevice.o \8 avdevice.o \
9 9
10OBJS-$(HAVE_MSVCRT) += file_open.o
11
12# input/output devices10# input/output devices
13OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \11OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
14 alsa-audio-dec.o12 alsa-audio-dec.o
@@ -31,6 +29,8 @@ OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o · 16 unmodified lines
31OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o29OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
32OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o30OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
33 31
32OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
33
34SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h34SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
35SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h35SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
36 36
libavformat/Makefile+2−2
@@ -23,8 +23,6 @@ OBJS = allformats.o \ · 22 unmodified lines
23 url.o \23 url.o \
24 utils.o \24 utils.o \
25 25
26OBJS-$(HAVE_MSVCRT) += file_open.o
27
28OBJS-$(CONFIG_NETWORK) += network.o26OBJS-$(CONFIG_NETWORK) += network.o
29OBJS-$(CONFIG_RIFFDEC) += riffdec.o27OBJS-$(CONFIG_RIFFDEC) += riffdec.o
30OBJS-$(CONFIG_RIFFENC) += riffenc.o28OBJS-$(CONFIG_RIFFENC) += riffenc.o
@@ -388,6 +386,8 @@ OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o · 357 unmodified lines
388OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o386OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
389OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o387OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o
390 388
389OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
390
391SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h391SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
392SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h392SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
393 393
libavutil/internal.h+1−1
@@ -204,7 +204,7 @@ void avpriv_report_missing_feature(void *avc, · 203 unmodified lines
204void avpriv_request_sample(void *avc,204void avpriv_request_sample(void *avc,
205 const char *msg, ...) av_printf_format(2, 3);205 const char *msg, ...) av_printf_format(2, 3);
206 206
207#if HAVE_MSVCRT207#if HAVE_LIBC_MSVCRT
208#define avpriv_open ff_open208#define avpriv_open ff_open
209#endif209#endif
210 210

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t