diff options
| author | Petr Uzel <petr.uzel@suse.cz> | 2012-04-22 16:16:39 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2012-04-23 14:05:25 +0200 |
| commit | 4f83dcceba66278378c5e759e56b4d48368bb796 (patch) | |
| tree | 49f80a8c4bb09bb172a9cdece2954e7df150a8c3 /sys-utils/lscpu.c | |
| parent | 82815995f0b39b4c931c2e84b5c25d64608a70e1 (diff) | |
| download | util-linux-4f83dcceba66278378c5e759e56b4d48368bb796.tar.gz | |
libblkid: befs: declare functions static
Since commit 0b0c231f64d02e682
(swapon: move generic code to swapon-common.c), if util-linux is
configured with --enable-static --disable-shared --enable-libmount-mount
options, the build fails with the following error:
...
libtool: link: gcc -std=gnu99 -fsigned-char -ggdb -O1 -Wall -D_FORTIFY_SOURCE=2 -o switch_root switch_root.o
/home/petr/upstream/util-linux/libblkid/src/.libs/libblkid.a(befs.o): In function `get_uuid':
/home/petr/upstream/util-linux/libblkid/src/superblocks/befs.c:333: multiple definition of `get_uuid'
swapon-swapon-common.o:/home/petr/upstream/util-linux/sys-utils/swapon-common.c:99: first defined here
collect2: ld returned 1 exit status
/bin/sh ../libtool --tag=CC --mode=link gcc -std=gnu99 -fsigned-char -ggdb -O1 -Wall -D_FORTIFY_SOURCE=2 -o flock flock.o strutils.o
libtool: link: gcc -std=gnu99 -fsigned-char -ggdb -O1 -Wall -D_FORTIFY_SOURCE=2 -o pivot_root pivot_root.o
make[2]: *** [swapon] Error 1
make[2]: *** Waiting for unfinished jobs....
/home/petr/upstream/util-linux/libblkid/src/.libs/libblkid.a(befs.o): In function `get_uuid':
/home/petr/upstream/util-linux/libblkid/src/superblocks/befs.c:333: multiple definition of `get_uuid'
swapoff-swapon-common.o:/home/petr/upstream/util-linux/sys-utils/swapon-common.c:99: first defined here
Fix by declaring befs funcitons static.
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'sys-utils/lscpu.c')
0 files changed, 0 insertions, 0 deletions