diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-09-16 07:31:59 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-09-16 07:31:59 +0200 |
| commit | 25dbfaf2b19514a243e5766745efe1823431031d (patch) | |
| tree | 7325454e88bca89dbd88c5dc15a2d834d848fadd | |
| parent | d25d07fb2485d2ab87dedf8ffee8db922700eb13 (diff) | |
| download | drakx-25dbfaf2b19514a243e5766745efe1823431031d.tar drakx-25dbfaf2b19514a243e5766745efe1823431031d.tar.gz drakx-25dbfaf2b19514a243e5766745efe1823431031d.tar.bz2 drakx-25dbfaf2b19514a243e5766745efe1823431031d.tar.xz drakx-25dbfaf2b19514a243e5766745efe1823431031d.zip | |
fix build with gcc7
| -rw-r--r-- | mdk-stage1/Makefile | 6 | ||||
| -rw-r--r-- | mdk-stage1/NEWS | 2 | ||||
| -rw-r--r-- | mdk-stage1/init.c | 4 | ||||
| -rw-r--r-- | mdk-stage1/probing.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 7ef066f76..c41f3cc50 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -55,8 +55,6 @@ FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS) STAGE1_OWN_LIBS = -lz -lldetect -lkmod -lpci -llzma -lsysfs -STAGE1_NETWORK_LIBS = -lresolv - #- stage1 itself STAGE1SRC = stage1.c log.c utils.c params.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c zlibsupport.c CDROMSRC = cdrom.c @@ -117,11 +115,11 @@ init: $(INITOBJS) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) +stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) +dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 302bbebff..5c890a6a5 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- fix build with gcc7 + 2.24 - recognize 8812au (mga#21043) diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 3d8d6a2f9..be2aa0de7 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -280,7 +280,9 @@ char* strcat(register char* s,register const char* t) char *dest=s; s+=strlen(s); for (;;) { - if (!(*s = *t)) break; ++s; ++t; + if (!(*s = *t)) + break; + ++s; ++t; } return dest; } diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index acad4701b..3c70ca952 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -460,7 +460,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { struct sysfs_attribute *modalias_attr; - char keyfile[256]; + char keyfile[300]; int i, id; if (dent->d_name[0] == '.') |