[Hamlib-developer] Build problem with Hamlib-4.5.5 git branch

[Brian M. <bd...@fe...>]

Hi Mike

This is happening when I try and build this branch, 4.6~git is fine.

Looks like somehow a -u was left out when diffing somewhere:

Making all in rigs/icom
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o ic275.lo ic275.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c ic275.c  -fPIC -DPIC -o .libs/ic275.o
In file included from ic275.c:27:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: ic275.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: *** Waiting for unfinished jobs....
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o ic735.lo ic735.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c ic735.c  -fPIC -DPIC -o .libs/ic735.o
In file included from ic735.c:27:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: ic735.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o icr8500.lo icr8500.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c icr8500.c  -fPIC -DPIC -o .libs/icr8500.o
In file included from icr8500.c:28:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: icr8500.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o ic775.lo ic775.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c ic775.c  -fPIC -DPIC -o .libs/ic775.o
In file included from ic775.c:27:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: ic775.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o ic706.lo ic706.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c ic706.c  -fPIC -DPIC -o .libs/ic706.o
In file included from ic706.c:27:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: ic706.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o frame.lo frame.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c frame.c  -fPIC -DPIC -o .libs/frame.o
In file included from frame.c:29:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: frame.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o ic756.lo ic756.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c ic756.c  -fPIC -DPIC -o .libs/ic756.o
In file included from ic756.c:29:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: ic756.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make[1]: Entering directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib  -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include  -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o icom.lo icom.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include/hamlib -DIN_HAMLIB -I../../include -I../../src -I../../lib -I../../include -Wall -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c icom.c  -fPIC -DPIC -o .libs/icom.o
In file included from icom.c:41:
icom.h:242:1: error: version control conflict marker in file
  242 | <<<<<<< HEAD
      | ^~~~~~~
icom.h:245:9: error: invalid suffix "d096c4a" on integer constant
  245 | >>>>>>> 9d096c4a (Improve powerstat on/off behavior for Icom rigs)
      |         ^~~~~~~~
make[1]: *** [Makefile:619: icom.lo] Error 1
make[1]: Leaving directory '/home/bdm/rpmbuild/BUILD/hamlib-4.5.5/rigs/icom'
make: *** [Makefile:636: all-recursive] Error 1


-- 

Brian  G8SEZ